diff --git a/srcpkgs/make/patches/fix-glibc-2.28.patch b/srcpkgs/make/patches/fix-glibc-2.28.patch index 62ecf66d7b5..3a20c2dc251 100644 --- a/srcpkgs/make/patches/fix-glibc-2.28.patch +++ b/srcpkgs/make/patches/fix-glibc-2.28.patch @@ -90,7 +90,17 @@ index 8c72568..4710832 100644 gnu glob # endif #endif], --- -cgit v1.0-41-gc330 - +--- a/configure.orig 2020-04-06 12:39:20.210525122 +0200 ++++ b/configure 2020-04-06 12:39:36.739696694 +0200 +@@ -11481,10 +11481,9 @@ else + #include + #include +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif diff --git a/srcpkgs/make/template b/srcpkgs/make/template index bffb9caa083..22559e22efd 100644 --- a/srcpkgs/make/template +++ b/srcpkgs/make/template @@ -8,7 +8,7 @@ revision=7 bootstrap=yes build_style=gnu-configure 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')" short_desc="The GNU make system" maintainer="Enno Boland " @@ -18,11 +18,3 @@ distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.bz2" checksum=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 build_options=guile 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 -}