[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.18-make-4.patch)

[Allan McRae]

    Date: Monday, October 21, 2013 @ 03:41:08
  Author: allan
Revision: 196894

upgpkg: glibc 2.18-6

manually remove unneeded static libraries, add patch to build with make-4

Added:
  glibc/trunk/glibc-2.18-make-4.patch
Modified:
  glibc/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   25 +++++++++++++++++--------
 glibc-2.18-make-4.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-20 21:59:03 UTC (rev 196893)
+++ PKGBUILD	2013-10-21 01:41:08 UTC (rev 196894)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=5
+pkgrel=6
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
@@ -19,13 +19,14 @@
 backup=(etc/gai.conf
         etc/locale.gen
         etc/nscd.conf)
-options=('!strip')
+options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
+        glibc-2.18-make-4.patch
         glibc-2.18-readdir_r-CVE-2013-4237.patch
-	glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
-	glibc-2.18-strcoll-CVE-2012-4412+4424.patch
-	glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+        glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
+        glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+        glibc-2.18-ptr-mangle-CVE-2013-4788.patch
         glibc-2.18-strstr-hackfix.patch
         nscd.service
         nscd.tmpfiles
@@ -33,6 +34,7 @@
         locale-gen)
 md5sums=('88fbbceafee809e82efd52efa1e3c58f'
          'SKIP'
+         'e1883c2d1b01ff73650db5f5bb5a5a52'
          '154da6bf5a5248f42a7bf5bf08e01a47'
          'b79561ab9dce900e9bbeaf0d49927c2b'
          'c7264b99d0f7e51922a4d3126182c40a'
@@ -41,11 +43,14 @@
          'd5fab2cd3abea65aa5ae696ea4a47d6b'
          'da662ca76e7c8d7efbc7986ab7acea2d'
          '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
+         '3d46e93c8d2771a22502d5a9603e5c49')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
+
+  # compatibility with make-4.0 (submitted upstream)
+  patch -p1 -i $srcdir/glibc-2.18-make-4.patch
+
   # upstream commit 91ce4085
   patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch
 
@@ -110,7 +115,7 @@
 }
 
 check() {
-  # bug to file - the linker commands need to be reordered
+  # the linker commands need to be reordered - fixed in 2.19
   LDFLAGS=${LDFLAGS/--as-needed,/}
 
   cd ${srcdir}/glibc-build
@@ -142,6 +147,10 @@
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
     ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
 
+  # remove the static libraries that have a shared counterpart
+  cd $pkgdir/usr/lib
+  rm lib{anl,BrokenLocale,c,crypt,dl,m,nsl,pthread,resolv,rt,util}.a
+
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
   #   ld-${pkgver}.so

Added: glibc-2.18-make-4.patch
===================================================================
--- glibc-2.18-make-4.patch	                        (rev 0)
+++ glibc-2.18-make-4.patch	2013-10-21 01:41:08 UTC (rev 196894)
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
+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 <Marc-Antoine at Perennou.com>
+---
+ configure    | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- a/configure
++++ b/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
+--- a/configure.in
++++ b/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
+