diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/glibc-2.18-make-4.patch b/srcpkgs/cross-arm-linux-gnueabi/files/glibc-2.18-make-4.patch deleted file mode 100644 index 0a842b12dd7..00000000000 --- a/srcpkgs/cross-arm-linux-gnueabi/files/glibc-2.18-make-4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Thu, 10 Oct 2013 14:26:12 +0900 -Subject: [PATCH] configure: allow building with GNU Make 4 - -Currently, configure errors telling make 4 is too old -since it does not match our regexp. - -configure.in: allow GNU Make 4.* - -Signed-off-by: Marc-Antoine Perennou ---- - configure | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 5e2f4d0..e139bf0 100755 ---- configure -+++ configure -@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } - ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 3.79* | 3.[89]*) -+ 3.79* | 3.[89]* | 4.*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index a7f9881..95c36b6 100644 ---- configure.in -+++ configure.in -@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, - critic_missing="$critic_missing gcc") - AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, - [GNU Make[^0-9]*\([0-9][0-9.]*\)], -- [3.79* | 3.[89]*], critic_missing="$critic_missing make") -+ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") - - AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, - [GNU gettext.* \([0-9]*\.[0-9.]*\)], --- -1.8.4.1 - diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index d140f0556d5..24db2b78cf2 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -110,9 +110,6 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - cd ${wrksrc}/glibc-${_glibc_version} - _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch - cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-make-4.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-make-4.patch deleted file mode 100644 index 0a842b12dd7..00000000000 --- a/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-make-4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Thu, 10 Oct 2013 14:26:12 +0900 -Subject: [PATCH] configure: allow building with GNU Make 4 - -Currently, configure errors telling make 4 is too old -since it does not match our regexp. - -configure.in: allow GNU Make 4.* - -Signed-off-by: Marc-Antoine Perennou ---- - configure | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 5e2f4d0..e139bf0 100755 ---- configure -+++ configure -@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } - ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 3.79* | 3.[89]*) -+ 3.79* | 3.[89]* | 4.*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index a7f9881..95c36b6 100644 ---- configure.in -+++ configure.in -@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, - critic_missing="$critic_missing gcc") - AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, - [GNU Make[^0-9]*\([0-9][0-9.]*\)], -- [3.79* | 3.[89]*], critic_missing="$critic_missing make") -+ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") - - AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, - [GNU gettext.* \([0-9]*\.[0-9.]*\)], --- -1.8.4.1 - diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index f1e125ab4eb..a3f133b0f37 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -110,9 +110,6 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - cd ${wrksrc}/glibc-${_glibc_version} - _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch - cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-make-4.patch b/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-make-4.patch deleted file mode 100644 index 0a842b12dd7..00000000000 --- a/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-make-4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Thu, 10 Oct 2013 14:26:12 +0900 -Subject: [PATCH] configure: allow building with GNU Make 4 - -Currently, configure errors telling make 4 is too old -since it does not match our regexp. - -configure.in: allow GNU Make 4.* - -Signed-off-by: Marc-Antoine Perennou ---- - configure | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 5e2f4d0..e139bf0 100755 ---- configure -+++ configure -@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } - ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 3.79* | 3.[89]*) -+ 3.79* | 3.[89]* | 4.*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index a7f9881..95c36b6 100644 ---- configure.in -+++ configure.in -@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, - critic_missing="$critic_missing gcc") - AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, - [GNU Make[^0-9]*\([0-9][0-9.]*\)], -- [3.79* | 3.[89]*], critic_missing="$critic_missing make") -+ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") - - AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, - [GNU gettext.* \([0-9]*\.[0-9.]*\)], --- -1.8.4.1 - diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/template b/srcpkgs/cross-arm-linux-gnueabihf7/template index e40df954fed..23f2b04953b 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf7/template +++ b/srcpkgs/cross-arm-linux-gnueabihf7/template @@ -110,9 +110,6 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - cd ${wrksrc}/glibc-${_glibc_version} - _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch - cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch deleted file mode 100644 index 0a842b12dd7..00000000000 --- a/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Thu, 10 Oct 2013 14:26:12 +0900 -Subject: [PATCH] configure: allow building with GNU Make 4 - -Currently, configure errors telling make 4 is too old -since it does not match our regexp. - -configure.in: allow GNU Make 4.* - -Signed-off-by: Marc-Antoine Perennou ---- - configure | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 5e2f4d0..e139bf0 100755 ---- configure -+++ configure -@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } - ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 3.79* | 3.[89]*) -+ 3.79* | 3.[89]* | 4.*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index a7f9881..95c36b6 100644 ---- configure.in -+++ configure.in -@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, - critic_missing="$critic_missing gcc") - AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, - [GNU Make[^0-9]*\([0-9][0-9.]*\)], -- [3.79* | 3.[89]*], critic_missing="$critic_missing make") -+ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") - - AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, - [GNU gettext.* \([0-9]*\.[0-9.]*\)], --- -1.8.4.1 - diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index b44d0845987..2cf6b513573 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -111,9 +111,6 @@ _linux_headers() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - cd ${wrksrc}/glibc-${_glibc_version} - _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch - cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-make-4.patch b/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-make-4.patch deleted file mode 100644 index 0a842b12dd7..00000000000 --- a/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-make-4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Thu, 10 Oct 2013 14:26:12 +0900 -Subject: [PATCH] configure: allow building with GNU Make 4 - -Currently, configure errors telling make 4 is too old -since it does not match our regexp. - -configure.in: allow GNU Make 4.* - -Signed-off-by: Marc-Antoine Perennou ---- - configure | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 5e2f4d0..e139bf0 100755 ---- configure -+++ configure -@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } - ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 3.79* | 3.[89]*) -+ 3.79* | 3.[89]* | 4.*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index a7f9881..95c36b6 100644 ---- configure.in -+++ configure.in -@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, - critic_missing="$critic_missing gcc") - AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, - [GNU Make[^0-9]*\([0-9][0-9.]*\)], -- [3.79* | 3.[89]*], critic_missing="$critic_missing make") -+ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") - - AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, - [GNU gettext.* \([0-9]*\.[0-9.]*\)], --- -1.8.4.1 - diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/template b/srcpkgs/cross-mips-softfloat-linux-gnu/template index ea77e6ec894..7ff9afc4370 100644 --- a/srcpkgs/cross-mips-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mips-softfloat-linux-gnu/template @@ -109,9 +109,6 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - cd ${wrksrc}/glibc-${_glibc_version} - _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch - cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-make-4.patch b/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-make-4.patch deleted file mode 100644 index 0a842b12dd7..00000000000 --- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-make-4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Thu, 10 Oct 2013 14:26:12 +0900 -Subject: [PATCH] configure: allow building with GNU Make 4 - -Currently, configure errors telling make 4 is too old -since it does not match our regexp. - -configure.in: allow GNU Make 4.* - -Signed-off-by: Marc-Antoine Perennou ---- - configure | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 5e2f4d0..e139bf0 100755 ---- configure -+++ configure -@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } - ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 3.79* | 3.[89]*) -+ 3.79* | 3.[89]* | 4.*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index a7f9881..95c36b6 100644 ---- configure.in -+++ configure.in -@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, - critic_missing="$critic_missing gcc") - AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, - [GNU Make[^0-9]*\([0-9][0-9.]*\)], -- [3.79* | 3.[89]*], critic_missing="$critic_missing make") -+ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") - - AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, - [GNU gettext.* \([0-9]*\.[0-9.]*\)], --- -1.8.4.1 - diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template index 0a5a7658e94..5069791d3d2 100644 --- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template @@ -109,9 +109,6 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - cd ${wrksrc}/glibc-${_glibc_version} - _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch - cd ${wrksrc} msg_normal "Building cross glibc headers\n"