[arch-commits] Commit in lib32-libstdc++5/trunk (PKGBUILD siginfo.patch)

[Florian Pritz]

    Date: Tuesday, May 20, 2014 @ 10:44:10
  Author: bluewind
Revision: 111556

fix build; fix FS#38919

upgpkg: lib32-libstdc++5 3.3.6-7

Added:
  lib32-libstdc++5/trunk/siginfo.patch
Modified:
  lib32-libstdc++5/trunk/PKGBUILD

---------------+
 PKGBUILD      |   27 +++++++++++++++++++--------
 siginfo.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-20 08:18:07 UTC (rev 111555)
+++ PKGBUILD	2014-05-20 08:44:10 UTC (rev 111556)
@@ -1,33 +1,44 @@
 # $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
 
 pkgname=lib32-libstdc++5
 pkgver=3.3.6
-pkgrel=6
+pkgrel=7
 pkgdesc="Legacy GNU Standard C++ library version 3 (32 bit)"
 arch=(x86_64)
 url="http://gcc.gnu.org"
 license=('GPL' 'LGPL')
 depends=('lib32-gcc-libs')
-makedepends=('gcc-multilib' 'binutils-multilib')
+makedepends=('gcc-multilib' 'binutils')
 options=('!libtool' '!makeflags')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
-        gcc-3.4.3-no_multilib_amd64.patch)
+        gcc-3.4.3-no_multilib_amd64.patch siginfo.patch)
 md5sums=('18c52e6fb8966b7700665dca289d077f'
          '6b3d00b8d079805be1b895f7f6ce47a0'
-         'b2a96584f4cee72362695ba44c911c40')
+         'b2a96584f4cee72362695ba44c911c40'
+         '64b9d275b400f0fd1e8b1932c12cea20')
 
-build(){
-  export CFLAGS="-march=${CARCH/_/-} -O2 -pipe"
-  export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe"
+prepare() {
   cd ${srcdir}/gcc-${pkgver}
 
   patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
+  patch -Np0 -i $srcdir/siginfo.patch
 
   # fix build issue with recent gcc
   sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c
   # No fixincludes
   sed -i -e 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
+}
 
+build(){
+  export CC="gcc -m32"
+  export CPP="cpp -m32"
+  export CXX="g++ -m32"
+  export CFLAGS="-march=${CARCH/_/-} -O2 -pipe"
+  export CPPFLAGS="-march=${CARCH/_/-} -O2 -pipe"
+  export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe"
+  cd ${srcdir}/gcc-${pkgver}
+
   mkdir ../gcc-build
   cd ../gcc-build
   # We build the full multilib libstdc++5 here, no idea how to restrict
@@ -34,7 +45,7 @@
   # the build process to the 32 bit version only.
   ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
       --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \
-      --enable-multilib
+      --enable-multilib --libdir=/usr/lib32
   make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O"
 }
 

Added: siginfo.patch
===================================================================
--- siginfo.patch	                        (rev 0)
+++ siginfo.patch	2014-05-20 08:44:10 UTC (rev 111556)
@@ -0,0 +1,28 @@
+--- gcc/config/i386/linux64.h.orig	2014-04-28 10:00:16.556121683 +0000
++++ gcc/config/i386/linux64.h	2014-04-28 10:00:43.105959247 +0000
+@@ -257,9 +257,9 @@
+       {									\
+ 	struct rt_sigframe {						\
+ 	  int sig;							\
+-	  struct siginfo *pinfo;					\
++	  siginfo_t *pinfo;					\
+ 	  void *puc;							\
+-	  struct siginfo info;						\
++	  siginfo_t info;						\
+ 	  struct ucontext uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
+--- gcc/config/i386/linux.h.orig	2014-04-28 10:00:16.556121683 +0000
++++ gcc/config/i386/linux.h	2014-04-28 10:00:43.105959247 +0000
+@@ -257,9 +257,9 @@
+       {									\
+ 	struct rt_sigframe {						\
+ 	  int sig;							\
+-	  struct siginfo *pinfo;					\
++	  siginfo_t *pinfo;					\
+ 	  void *puc;							\
+-	  struct siginfo info;						\
++	  siginfo_t info;						\
+ 	  struct ucontext uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\