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

[Jan de Groot]

    Date: Monday, April 28, 2014 @ 12:19:45
  Author: jgc
Revision: 211852

upgpkg: libstdc++5 3.3.6-5

Fix build (FS#39461)

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

---------------+
 PKGBUILD      |   28 ++++++++++++++++++----------
 siginfo.patch |   14 ++++++++++++++
 2 files changed, 32 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 08:33:22 UTC (rev 211851)
+++ PKGBUILD	2014-04-28 10:19:45 UTC (rev 211852)
@@ -3,7 +3,7 @@
 
 pkgname=libstdc++5
 pkgver=3.3.6
-pkgrel=4
+pkgrel=5
 pkgdesc="GNU Standard C++ library version 3"
 arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
@@ -12,17 +12,16 @@
 makedepends=('binutils' 'gcc')
 options=('!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'
-         '088e0807e677010cafe4e590e8711be1')
+         '088e0807e677010cafe4e590e8711be1'
+         'bf36b281a9fc81f624f31f2623a3ad0e')
 
-build(){
-  export CFLAGS="-march=${CARCH/_/-} -O2 -pipe"
-  export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe"
+prepare() {
+  cd gcc-$pkgver
 
-  cd ${srcdir}/gcc-${pkgver}
-
   if [ "$CARCH" = "x86_64" ]; then
     patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
   fi
@@ -33,9 +32,18 @@
   # No fixincludes
   sed -i -e 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
 
+  patch -Np0 -i ../siginfo.patch
+
   mkdir ../gcc-build
-  cd ../gcc-build
-  ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
+}
+
+build(){
+  export CFLAGS="-march=${CARCH/_/-} -O2"
+  export CXXFLAGS="-march=${CARCH/_/-} -O2"
+  unset CPPFLAGS
+
+  cd gcc-build
+  CPP=/usr/bin/cpp ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
       --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \
       --disable-multilib --libdir=/usr/lib
   make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O"

Added: siginfo.patch
===================================================================
--- siginfo.patch	                        (rev 0)
+++ siginfo.patch	2014-04-28 10:19:45 UTC (rev 211852)
@@ -0,0 +1,14 @@
+--- 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;		\