make: avoid the need to autoreconf it.

This is a bootstrap pkg and as such, in the "bootstrap" target
the host is not expected to have autoconf/automake!
This commit is contained in:
Juan RP 2020-04-06 13:13:45 +02:00
parent aa1e576abe
commit 5416365069
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
2 changed files with 14 additions and 12 deletions

View file

@ -90,7 +90,17 @@ index 8c72568..4710832 100644
gnu glob gnu glob
# endif # endif
#endif], #endif],
-- --- a/configure.orig 2020-04-06 12:39:20.210525122 +0200
cgit v1.0-41-gc330 +++ b/configure 2020-04-06 12:39:36.739696694 +0200
@@ -11481,10 +11481,9 @@ else
#include <glob.h>
#include <fnmatch.h>
-#define GLOB_INTERFACE_VERSION 1
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
# include <gnu-versions.h>
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
gnu glob
# endif
#endif

View file

@ -8,7 +8,7 @@ revision=7
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="$(vopt_with guile)" configure_args="$(vopt_with guile)"
hostmakedepends="$(vopt_if guile pkg-config) xz" hostmakedepends="$(vopt_if guile pkg-config)"
makedepends="$(vopt_if guile 'gc-devel guile-devel')" makedepends="$(vopt_if guile 'gc-devel guile-devel')"
short_desc="The GNU make system" short_desc="The GNU make system"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
@ -18,11 +18,3 @@ distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.bz2"
checksum=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 checksum=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
build_options=guile build_options=guile
patch_args="-Np1" patch_args="-Np1"
# This should be temporary until upstream releases a new version with fixes
if [ -n "$CHROOT_READY" ]; then
hostmakedepends+=" automake gettext-devel pkg-config tar"
fi
pre_configure() {
autoreconf -fi
}