[arch-commits] Commit in (6 files)

Laurent Carlier lcarlier at nymeria.archlinux.org
Tue Apr 16 17:05:40 UTC 2013


    Date: Tuesday, April 16, 2013 @ 19:05:40
  Author: lcarlier
Revision: 88357

dependency for lib32-mesa>9.1.x

Added:
  lib32-elfutils/
  lib32-elfutils/repos/
  lib32-elfutils/trunk/
  lib32-elfutils/trunk/PKGBUILD
  lib32-elfutils/trunk/elfutils-0.155-binutils-pr-ld-13621.patch
  lib32-elfutils/trunk/git-fixes.patch

-------------------------------------------+
 PKGBUILD                                  |   53 +++++++++++++++++++
 elfutils-0.155-binutils-pr-ld-13621.patch |   16 +++++
 git-fixes.patch                           |   75 ++++++++++++++++++++++++++++
 3 files changed, 144 insertions(+)

Added: lib32-elfutils/trunk/PKGBUILD
===================================================================
--- lib32-elfutils/trunk/PKGBUILD	                        (rev 0)
+++ lib32-elfutils/trunk/PKGBUILD	2013-04-16 17:05:40 UTC (rev 88357)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Andrej Gelenberg <andrej.gelenberg at udo.edu>
+
+_pkgbasename=elfutils
+pkgname=lib32-elfutils
+pkgver=0.155
+pkgrel=1
+pkgdesc="Collection of libraries for working with ELF object files and DWARF debugging information (32-bit)"
+arch=('x86_64')
+url="https://fedorahosted.org/elfutils/"
+license=('LGPL3' 'GPL' 'GPL3')
+depends=('lib32-bzip2' 'lib32-zlib')
+makedepends=('gcc-multilib')
+options=('!makeflags')
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2
+        elfutils-0.155-binutils-pr-ld-13621.patch
+        git-fixes.patch)
+sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b'
+          '8a8be7c0686c6311c1ce969ba10494e704ead48c'
+          '0caab67ed6073a81ca836a4172fa4af35cc1d817')
+
+prepare() {
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+  patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch
+  patch -Np1 -i ../git-fixes.patch
+}
+
+build() {
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+	
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  CFLAGS+=" -g"  # required for test-suite success
+  
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+check() {
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+  make check
+}
+
+package() {
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/{bin,include,share}
+}

Added: lib32-elfutils/trunk/elfutils-0.155-binutils-pr-ld-13621.patch
===================================================================
--- lib32-elfutils/trunk/elfutils-0.155-binutils-pr-ld-13621.patch	                        (rev 0)
+++ lib32-elfutils/trunk/elfutils-0.155-binutils-pr-ld-13621.patch	2013-04-16 17:05:40 UTC (rev 88357)
@@ -0,0 +1,16 @@
+diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
+index 4b01008..7a5f0c8 100755
+--- a/tests/run-elflint-self.sh
++++ b/tests/run-elflint-self.sh
+@@ -18,4 +18,11 @@
+ 
+ . $srcdir/test-subr.sh
+ 
++# Makes sure we exit cleanly even when we don't...
++clean_exit()
++{
++  if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi
++}
++trap clean_exit EXIT
++
+ testrun_on_self ../src/elflint --quiet --gnu-ld

Added: lib32-elfutils/trunk/git-fixes.patch
===================================================================
--- lib32-elfutils/trunk/git-fixes.patch	                        (rev 0)
+++ lib32-elfutils/trunk/git-fixes.patch	2013-04-16 17:05:40 UTC (rev 88357)
@@ -0,0 +1,75 @@
+From 57bd66cabf6e6b9ecf622cdbf350804897a8df58 Mon Sep 17 00:00:00 2001
+From: Roland McGrath <roland at hack.frob.com>
+Date: Tue, 11 Dec 2012 17:42:07 +0000
+Subject: nm: Fix size passed to snprintf for invalid sh_name case.
+
+Signed-off-by: Roland McGrath <roland at hack.frob.com>
+---
+(limited to 'src/nm.c')
+
+diff --git a/src/nm.c b/src/nm.c
+index f50da0b..8a1c57a 100644
+--- a/src/nm.c
++++ b/src/nm.c
+@@ -769,8 +769,9 @@ show_symbols_sysv (Ebl *ebl, GElf_Word strndx, const char *fullname,
+ 			       gelf_getshdr (scn, &shdr_mem)->sh_name);
+       if (unlikely (name == NULL))
+ 	{
+-	  name = alloca (sizeof "[invalid sh_name 0x12345678]");
+-	  snprintf (name, sizeof name, "[invalid sh_name %#" PRIx32 "]",
++          const size_t bufsz = sizeof "[invalid sh_name 0x12345678]"
++	  name = alloca (bufsz);
++	  snprintf (name, bufsz, "[invalid sh_name %#" PRIx32 "]",
+ 		    gelf_getshdr (scn, &shdr_mem)->sh_name);
+ 	}
+       scnnames[elf_ndxscn (scn)] = name;
+--
+cgit v0.9.1
+From 7df3d2cd70932cd70515dbeb75e4db66fd27f192 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mjw at redhat.com>
+Date: Tue, 11 Dec 2012 21:27:05 +0000
+Subject: Add missing semicolon in show_symbols_sysv
+
+Signed-off-by: Mark Wielaard <mjw at redhat.com>
+---
+(limited to 'src/nm.c')
+
+diff --git a/src/nm.c b/src/nm.c
+index 8a1c57a..7aae84b 100644
+--- a/src/nm.c
++++ b/src/nm.c
+@@ -769,7 +769,7 @@ show_symbols_sysv (Ebl *ebl, GElf_Word strndx, const char *fullname,
+ 			       gelf_getshdr (scn, &shdr_mem)->sh_name);
+       if (unlikely (name == NULL))
+ 	{
+-          const size_t bufsz = sizeof "[invalid sh_name 0x12345678]"
++	  const size_t bufsz = sizeof "[invalid sh_name 0x12345678]";
+ 	  name = alloca (bufsz);
+ 	  snprintf (name, bufsz, "[invalid sh_name %#" PRIx32 "]",
+ 		    gelf_getshdr (scn, &shdr_mem)->sh_name);
+--
+cgit v0.9.1
+From 1a4d0668d18bf1090c5c08cdb5cb3ba2b8eb5410 Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <David.Abdurachmanov at cern.ch>
+Date: Sun, 13 Jan 2013 15:44:21 +0000
+Subject: ar.c (do_oper_delete): Fix num passed to memset.
+
+Signed-off-by: David Abdurachmanov <David.Abdurachmanov at cern.ch>
+---
+(limited to 'src/ar.c')
+
+diff --git a/src/ar.c b/src/ar.c
+index 03da1b7..2d6ad60 100644
+--- a/src/ar.c
++++ b/src/ar.c
+@@ -919,7 +919,7 @@ do_oper_delete (const char *arfname, char **argv, int argc,
+ 		long int instance)
+ {
+   bool *found = alloca (sizeof (bool) * argc);
+-  memset (found, '\0', sizeof (found));
++  memset (found, '\0', sizeof (bool) * argc);
+ 
+   /* List of the files we keep.  */
+   struct armem *to_copy = NULL;
+--
+cgit v0.9.1




More information about the arch-commits mailing list