[arch-commits] Commit in lib32-libstdc++5/repos/multilib-x86_64 (5 files)
Florian Pritz
bluewind at nymeria.archlinux.org
Tue May 20 08:44:14 UTC 2014
Date: Tuesday, May 20, 2014 @ 10:44:14
Author: bluewind
Revision: 111557
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libstdc++5/repos/multilib-x86_64/PKGBUILD
(from rev 111556, lib32-libstdc++5/trunk/PKGBUILD)
lib32-libstdc++5/repos/multilib-x86_64/gcc-3.4.3-no_multilib_amd64.patch
(from rev 111556, lib32-libstdc++5/trunk/gcc-3.4.3-no_multilib_amd64.patch)
lib32-libstdc++5/repos/multilib-x86_64/siginfo.patch
(from rev 111556, lib32-libstdc++5/trunk/siginfo.patch)
Deleted:
lib32-libstdc++5/repos/multilib-x86_64/PKGBUILD
lib32-libstdc++5/repos/multilib-x86_64/gcc-3.4.3-no_multilib_amd64.patch
-----------------------------------+
PKGBUILD | 109 +++++++++++++++++++-----------------
gcc-3.4.3-no_multilib_amd64.patch | 22 +++----
siginfo.patch | 28 +++++++++
3 files changed, 99 insertions(+), 60 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-20 08:44:10 UTC (rev 111556)
+++ PKGBUILD 2014-05-20 08:44:14 UTC (rev 111557)
@@ -1,49 +0,0 @@
-# $Id$
-
-pkgname=lib32-libstdc++5
-pkgver=3.3.6
-pkgrel=6
-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')
-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)
-md5sums=('18c52e6fb8966b7700665dca289d077f'
- '6b3d00b8d079805be1b895f7f6ce47a0'
- 'b2a96584f4cee72362695ba44c911c40')
-
-build(){
- export CFLAGS="-march=${CARCH/_/-} -O2 -pipe"
- export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe"
- cd ${srcdir}/gcc-${pkgver}
-
- patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.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
-
- mkdir ../gcc-build
- cd ../gcc-build
- # We build the full multilib libstdc++5 here, no idea how to restrict
- # 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
- make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O"
-}
-
-package() {
- cd ${srcdir}/gcc-build
- make DESTDIR=${pkgdir} install-target-libstdc++-v3
-
- # Only install the lib32 files
- rm -rf ${pkgdir}/usr/{include,share,lib}
- rm -f ${pkgdir}/usr/lib32/*.a
- rm -f ${pkgdir}/usr/lib32/libstdc++.so
-}
Copied: lib32-libstdc++5/repos/multilib-x86_64/PKGBUILD (from rev 111556, lib32-libstdc++5/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-05-20 08:44:14 UTC (rev 111557)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+
+pkgname=lib32-libstdc++5
+pkgver=3.3.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')
+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 siginfo.patch)
+md5sums=('18c52e6fb8966b7700665dca289d077f'
+ '6b3d00b8d079805be1b895f7f6ce47a0'
+ 'b2a96584f4cee72362695ba44c911c40'
+ '64b9d275b400f0fd1e8b1932c12cea20')
+
+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
+ # 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 --libdir=/usr/lib32
+ make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O"
+}
+
+package() {
+ cd ${srcdir}/gcc-build
+ make DESTDIR=${pkgdir} install-target-libstdc++-v3
+
+ # Only install the lib32 files
+ rm -rf ${pkgdir}/usr/{include,share,lib}
+ rm -f ${pkgdir}/usr/lib32/*.a
+ rm -f ${pkgdir}/usr/lib32/libstdc++.so
+}
Deleted: gcc-3.4.3-no_multilib_amd64.patch
===================================================================
--- gcc-3.4.3-no_multilib_amd64.patch 2014-05-20 08:44:10 UTC (rev 111556)
+++ gcc-3.4.3-no_multilib_amd64.patch 2014-05-20 08:44:14 UTC (rev 111557)
@@ -1,11 +0,0 @@
---- gcc/config/i386/t-linux64.orig 2003-06-28 00:19:59.000000000 +0000
-+++ gcc/config/i386/t-linux64 2003-06-28 00:20:07.000000000 +0000
-@@ -6,7 +6,7 @@
-
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
Copied: lib32-libstdc++5/repos/multilib-x86_64/gcc-3.4.3-no_multilib_amd64.patch (from rev 111556, lib32-libstdc++5/trunk/gcc-3.4.3-no_multilib_amd64.patch)
===================================================================
--- gcc-3.4.3-no_multilib_amd64.patch (rev 0)
+++ gcc-3.4.3-no_multilib_amd64.patch 2014-05-20 08:44:14 UTC (rev 111557)
@@ -0,0 +1,11 @@
+--- gcc/config/i386/t-linux64.orig 2003-06-28 00:19:59.000000000 +0000
++++ gcc/config/i386/t-linux64 2003-06-28 00:20:07.000000000 +0000
+@@ -6,7 +6,7 @@
+
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64 ../lib
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
Copied: lib32-libstdc++5/repos/multilib-x86_64/siginfo.patch (from rev 111556, lib32-libstdc++5/trunk/siginfo.patch)
===================================================================
--- siginfo.patch (rev 0)
+++ siginfo.patch 2014-05-20 08:44:14 UTC (rev 111557)
@@ -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; \
More information about the arch-commits
mailing list