diff --git a/srcpkgs/dar/patches/fix-configure.patch b/srcpkgs/dar/patches/fix-configure.patch deleted file mode 100644 index f6b6a04578c..00000000000 --- a/srcpkgs/dar/patches/fix-configure.patch +++ /dev/null @@ -1,36 +0,0 @@ -Disable cross compile checks for libgcrypt usability -tests. They are not required. - ---- a/configure 2015-10-18 14:02:02.423216637 +0200 -+++ b/configure 2015-10-18 14:04:45.198228372 +0200 -@@ -22294,7 +22294,7 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcrypt usability" >&5 - $as_echo_n "checking for libgcrypt usability... " >&6; } -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = xxx; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run test program while cross compiling -@@ -22334,7 +22334,7 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 - $as_echo "ok" >&6; } -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = xxx; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run test program while cross compiling -diff --git configure configure -index 157b7a9..7c6a50d 100755 ---- a/configure -+++ b/configure -@@ -25481,7 +25481,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libthreadar() operationability" >&5 - $as_echo_n "checking for libthreadar() operationability... " >&6; } -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = xxx; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run test program while cross compiling diff --git a/srcpkgs/dar/patches/musl-getopt.patch b/srcpkgs/dar/patches/musl-getopt.patch deleted file mode 100644 index 1200567a30d..00000000000 --- a/srcpkgs/dar/patches/musl-getopt.patch +++ /dev/null @@ -1,19 +0,0 @@ -Since the musl libc constellation results in unistd.h being -included, which defines the getopt() function but not the -getopt globals, define them here as well. - ---- a/src/dar_suite/my_getopt_long.h 2015-10-17 10:42:50.000000000 +0200 -+++ b/src/dar_suite/my_getopt_long.h 2015-10-18 13:13:32.631006858 +0200 -@@ -27,6 +27,12 @@ - #ifndef MY_GETOPT_LONG_H - #define MY_GETOPT_LONG_H - -+#if !defined(__GLIBC__) -+// declare externs which would be defined when including getopt.h -+extern char *optarg; -+extern int optind, opterr, optopt, optreset; -+#endif -+ - // getopt may be declated in on systems like FreeBSD. - // if you want to use libgnugetopt you need to include - // on this system. Thus a conflict appear because the getopt is diff --git a/srcpkgs/dar/template b/srcpkgs/dar/template index c289909e812..51aa02f6aed 100644 --- a/srcpkgs/dar/template +++ b/srcpkgs/dar/template @@ -1,19 +1,19 @@ # Template file for 'dar' pkgname=dar -version=2.6.13 +version=2.7.9 revision=1 build_style=gnu-configure configure_args="--disable-upx --disable-build-html" conf_files="/etc/darrc" -hostmakedepends="automake gettext-devel gpgme-devel libtool pkg-config" +hostmakedepends="automake gettext-devel gpgme-devel libtool pkg-config which" makedepends="acl-devel bzip2-devel e2fsprogs-devel libgcrypt-devel liblzma-devel - lzo-devel librsync-devel libcurl-devel" + lzo-devel librsync-devel libcurl-devel libargon2-devel" short_desc="Shell command that backs up directory trees and files" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://dar.linux.free.fr/" distfiles="${SOURCEFORGE_SITE}/dar/dar-${version}.tar.gz" -checksum=3fea9ff9e55fb9827e17a080de7d1a2605b82c2320c0dec969071efefdbfd097 +checksum=1c609f691f99e6a868c0a6fcf70d2f5d2adee5dc3c0cbf374e69983129677df5 if [ "$CROSS_BUILD" ]; then configure_args+=" --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr @@ -21,6 +21,15 @@ if [ "$CROSS_BUILD" ]; then LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lgcrypt" fi +post_extract() { + if [ "$CROSS_BUILD" ]; then + # skip building checks, its trying to execute a target + # binary and we don't run the checks for cross builds + # anywyas. + vsed -e '/SUBDIRS =/s/check//g' -i src/Makefile.in + fi +} + do_check() { # need to be run as root :