diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-29 04:05:57 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-29 04:05:57 +0000 |
| commit | 88f9886de50562f083fa45359821567b0a880ea0 (patch) | |
| tree | 9d6e6861bee113342e27578c9024b17a3d4ceb5f /extra/libstdc++5 | |
| parent | 84fbb975eaab5e85082b96147a85031f1912646e (diff) | |
Tue Apr 29 04:01:38 UTC 2014
Diffstat (limited to 'extra/libstdc++5')
| -rw-r--r-- | extra/libstdc++5/PKGBUILD | 30 | ||||
| -rw-r--r-- | extra/libstdc++5/siginfo.patch | 14 |
2 files changed, 33 insertions, 11 deletions
diff --git a/extra/libstdc++5/PKGBUILD b/extra/libstdc++5/PKGBUILD index fdb604f4f..5cb4f309f 100644 --- a/extra/libstdc++5/PKGBUILD +++ b/extra/libstdc++5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198242 2013-10-30 13:40:46Z allan $ +# $Id: PKGBUILD 211853 2014-04-28 10:19:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> 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,16 +12,15 @@ depends=('gcc-libs') 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" - - cd ${srcdir}/gcc-${pkgver} +prepare() { + cd gcc-$pkgver if [ "$CARCH" = "x86_64" ]; then patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch @@ -33,9 +32,18 @@ build(){ # No fixincludes sed -i -e 's@\./fixinc\.sh@-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" diff --git a/extra/libstdc++5/siginfo.patch b/extra/libstdc++5/siginfo.patch new file mode 100644 index 000000000..4292c1aff --- /dev/null +++ b/extra/libstdc++5/siginfo.patch @@ -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; \ |