From 0fc1870f2eadde8cb06004be1cbe8d1a4333aa69 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 Aug 2012 00:02:36 +0000 Subject: Thu Aug 16 00:02:36 UTC 2012 --- multilib-testing/binutils-multilib/PKGBUILD | 5 +- multilib-testing/gcc-multilib/PKGBUILD | 33 +++++------ multilib-testing/lib32-glibc/PKGBUILD | 10 +++- .../lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch | 68 ++++++++++++++++++++++ 4 files changed, 92 insertions(+), 24 deletions(-) create mode 100644 multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch (limited to 'multilib-testing') diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD index adcc23cf0..77edc6ddb 100644 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ b/multilib-testing/binutils-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73235 2012-07-04 01:11:59Z heftig $ +# $Id: PKGBUILD 75114 2012-08-14 08:29:19Z allan $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae @@ -6,7 +6,7 @@ pkgname=binutils-multilib pkgver=2.22 -pkgrel=8 +pkgrel=10 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" arch=('x86_64') @@ -28,6 +28,7 @@ build() { mkdir binutils-build && cd binutils-build ${srcdir}/binutils/configure --prefix=/usr \ + --with-lib-path=/usr/lib:/usr/local/lib \ --enable-ld=default --enable-gold \ --enable-plugins --enable-threads \ --enable-shared \ diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD index 85f73ad1b..9c6ae58d6 100644 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ b/multilib-testing/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73236 2012-07-04 01:12:10Z heftig $ +# $Id: PKGBUILD 75115 2012-08-14 08:29:30Z allan $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae @@ -8,9 +8,9 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.7.1 -pkgrel=4 -#_snapshot=4.7-20120505 -_libstdcppmanver=20120605 # Note: check source directory name when updating this +pkgrel=6 +_snapshot=4.7-20120721 +_libstdcppmanver=20120725 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,19 +19,17 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'lib32-glibc>=2.16') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch - gcc-4.7.1-libada-pic.patch - gcc-4.7.1-libgo-write.patch - gcc-4.7.1-libgo-mksysinfo.patch) -md5sums=('933e6f15f51c031060af64a9e14149ff' - '767c62f9a047c4434f2345decf1d0819' + gcc-4.7.1-libada-pic.patch + gcc-4.7.1-libgo-write.patch) +md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' + '79c4381f983b71868c02da3379e1e8a2' 'ec24c32d3d1030c2bc8cb2ad2d1dc629' '2acbc9d35cc9d72329dc71d6b1f162ef' - 'df82dd175ac566c8a6d46b11ac21f14c' - '8e847244dba042d0aa3297713edaf70c') + 'df82dd175ac566c8a6d46b11ac21f14c') if [ -n "${_snapshot}" ]; then @@ -57,9 +55,6 @@ build() { # bug to file... patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch - # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html - patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch - echo ${pkgver} > gcc/BASE-VER cd ${srcdir} @@ -82,7 +77,7 @@ build() { --with-linker-hash-style=gnu \ --enable-multilib --disable-libssp \ --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release --with-fpmath=sse + --enable-checking=release make } @@ -194,9 +189,7 @@ package_gcc-multilib() rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 rm $pkgdir/usr/share/man/man3/ffi* - # many packages require these symlinks - #install -dm755 ${pkgdir}/lib - #ln -s /usr/bin/cpp ${pkgdir}/lib/cpp + # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 69c1a2c63..1f71aade3 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73419 2012-07-07 13:03:07Z allan $ +# $Id: PKGBUILD 75116 2012-08-14 08:29:36Z allan $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" @@ -19,11 +19,13 @@ options=('!strip' '!emptydirs') source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch glibc-2.15-revert-c5a0802a.patch + glibc-2.16-rpcgen-cpp-path.patch lib32-glibc.conf) md5sums=('80b181b02ab249524ec92822c0174cf7' '2a1221a15575820751c325ef4d2fbb90' '31f415b41197d85d3bbee3d1eecd06a3' '0a0383d50d63f1c02919fe9943b82014' + 'ea6a43915474e8276e9361eed6a01280' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -37,6 +39,10 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=552960 patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + # prevent need for /lib/cpp symlink + # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a + patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch + cd ${srcdir} mkdir glibc-build cd glibc-build diff --git a/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch new file mode 100644 index 000000000..822b57294 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch @@ -0,0 +1,68 @@ +diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c +index 06d951a..2103b10 100644 +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -75,12 +75,9 @@ struct commandline + + static const char *cmdname; + +-#define SVR4_CPP "/usr/ccs/lib/cpp" +-#define SUNOS_CPP "/lib/cpp" +- + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "/lib/cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -327,23 +324,17 @@ find_cpp (void) + { + struct stat buf; + +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } ++ if (stat (CPP, &buf) == 0) ++ return; ++ ++ if (cppDefined) /* user specified cpp but it does not exist */ ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ crash (); + } ++ ++ /* fall back to system CPP */ ++ CPP = "cpp"; + } + + /* +@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); +- perror ("execv"); ++ execvp (arglist[0], (char **) arglist); ++ if (errno == ENOENT) ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ exit (1); ++ } ++ perror ("execvp"); + exit (1); + case -1: + perror ("fork"); -- cgit v1.2.3