[arch-commits] Commit in lib32-glibc/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, January 7, 2014 @ 14:27:35
  Author: heftig
Revision: 103537

2.18-12

Added:
  lib32-glibc/trunk/glibc-2.18-xattr-compat-hack.patch
Modified:
  lib32-glibc/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   12 +++++++++---
 glibc-2.18-xattr-compat-hack.patch |   19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-07 11:49:50 UTC (rev 103536)
+++ PKGBUILD	2014-01-07 13:27:35 UTC (rev 103537)
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.18
-pkgrel=11
+pkgrel=12
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libc"
@@ -26,6 +26,7 @@
         glibc-2.18-getaddrinfo-assertion.patch
         glibc-2.18-scanf-parse-0e-0.patch
         glibc-2.18-strstr-hackfix.patch
+        glibc-2.18-xattr-compat-hack.patch
         lib32-glibc.conf)
 md5sums=('88fbbceafee809e82efd52efa1e3c58f'
          'SKIP'
@@ -38,6 +39,7 @@
          'd4d86add33f22125777e0ecff06bc9bb'
          '01d19fe9b2aea489cf5651530e0369f2'
          '4441f6dfe7d75ced1fa75e54dd21d36e'
+         '7ca96c68a37f2a4ab91792bfa0160a24'
          '6e052f1cb693d5d3203f50f9d4e8c33b')
 
 prepare() {
@@ -69,6 +71,9 @@
 
   # hack fix for strstr issues on x86
   patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
+  
+  # hack fix for {linux,sys}/xattr.h incompatibility
+  patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch
 
   mkdir ${srcdir}/glibc-build
 }
@@ -148,8 +153,9 @@
   ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
 
   # remove the static libraries that have a shared counterpart
-  # note: keep libc, libdl, libm, libpthread for binutils testsuite
-  rm $pkgdir/usr/lib32/lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a
+  # libc, libdl, libm and libpthread are required for toolchain testsuites
+  # in addition libcrypt appears widely required
+  rm $pkgdir/usr/lib32/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
 
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):

Added: glibc-2.18-xattr-compat-hack.patch
===================================================================
--- glibc-2.18-xattr-compat-hack.patch	                        (rev 0)
+++ glibc-2.18-xattr-compat-hack.patch	2014-01-07 13:27:35 UTC (rev 103537)
@@ -0,0 +1,19 @@
+diff -Naur glibc-2.18-orig/misc/sys/xattr.h glibc-2.18/misc/sys/xattr.h
+--- glibc-2.18-orig/misc/sys/xattr.h	2013-08-11 08:52:55.000000000 +1000
++++ glibc-2.18/misc/sys/xattr.h	2014-01-07 15:45:50.533969040 +1000
+@@ -26,13 +26,8 @@
+ 
+ /* The following constants should be used for the fifth parameter of
+    `*setxattr'.  */
+-enum
+-{
+-  XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
+-#define XATTR_CREATE	XATTR_CREATE
+-  XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
+-#define XATTR_REPLACE	XATTR_REPLACE
+-};
++#define XATTR_CREATE	1
++#define XATTR_REPLACE	2
+ 
+ /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
+    is SIZE bytes long).  Return 0 on success, -1 for errors.  */