summaryrefslogtreecommitdiff
path: root/multilib
diff options
context:
space:
mode:
Diffstat (limited to 'multilib')
-rw-r--r--multilib/gcc-multilib/PKGBUILD16
-rw-r--r--multilib/gcc-multilib/gcc_pure64.patch6
-rw-r--r--multilib/lib32-glibc/PKGBUILD49
-rw-r--r--multilib/lib32-glibc/glibc-2.14-libdl-crash.patch2
-rw-r--r--multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch37
-rw-r--r--multilib/lib32-glibc/lib32-glibc.conf1
-rw-r--r--multilib/lib32-pcre/PKGBUILD6
-rw-r--r--multilib/libtool-multilib/PKGBUILD6
8 files changed, 80 insertions, 43 deletions
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index 7f2b02f87..4b2f0c3b7 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54869 2011-08-26 22:10:40Z allan $
+# $Id: PKGBUILD 57525 2011-10-30 06:48:49Z allan $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -7,9 +7,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.6.1
-pkgrel=4
-_snapshot=4.6-20110819
+pkgver=4.6.2
+pkgrel=1
+#_snapshot=4.6-20110819
_libstdcppmanver=20110814 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection for multilib"
arch=('x86_64')
@@ -19,14 +19,14 @@ makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multili
'lib32-glibc>=2.14')
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.patch
gcc-hash-style-both.patch)
-md5sums=('b14d22730f9085eab7fd927039e68d28'
+md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
'ce920d2550ff7e042b9f091d27764d8f'
- '22cec272f9cc2801d3cd348feaca888b'
+ '4030ee1c08dd1e843c0225b772360e76'
'4df25b623799b148a0703eaeec8fdf3f')
if [ -n "${_snapshot}" ]; then
diff --git a/multilib/gcc-multilib/gcc_pure64.patch b/multilib/gcc-multilib/gcc_pure64.patch
index 8c6b08171..8c0baf8e2 100644
--- a/multilib/gcc-multilib/gcc_pure64.patch
+++ b/multilib/gcc-multilib/gcc_pure64.patch
@@ -1,11 +1,13 @@
diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
--- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
-@@ -49,7 +49,7 @@
+@@ -49,8 +49,8 @@
+ When the -shared link option is used a final link is not being
done. */
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#undef LINK_SPEC
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
index b06cd23f4..48057fdec 100644
--- a/multilib/lib32-glibc/PKGBUILD
+++ b/multilib/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55393 2011-09-11 20:34:00Z heftig $
+# $Id: PKGBUILD 57526 2011-10-30 06:49:02Z allan $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -8,9 +8,9 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
-pkgver=2.14
-pkgrel=6
-_glibcdate=20110908
+pkgver=2.14.1
+pkgrel=1
+_glibcdate=20111025
pkgdesc="GNU C Library for multilib"
arch=('x86_64')
url="http://www.gnu.org/software/libc"
@@ -25,25 +25,23 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
glibc-2.12.1-static-shared-getpagesize.patch
glibc-2.12.2-ignore-origin-of-privileged-program.patch
glibc-2.13-futex.patch
- glibc-2.13-dlclose-search-reset.patch
glibc-2.14-libdl-crash.patch
- glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
+ glibc-2.14-revert-4768ae77.patch
glibc-2.14-reexport-rpc-interface.patch
glibc-2.14-reinstall-nis-rpc-headers.patch
lib32-glibc.conf)
-md5sums=('069069eb9100cc7affd7ad884cb3c3e9'
+md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
'a3ac6f318d680347bb6e2805d42b73b2'
'b042647ea7d6f22ad319e12e796bd13e'
'7d0154b7e17ea218c9fa953599d24cc4'
- '22d09c58718fb3d1d31c3a6c14ca6886'
- 'cea62cc6b903d222c5f26e05a3c0e0e6'
- '13728807283f111e5d9d38cf38e0a461'
+ '6970bcfeb3bf88913436d5112d16f588'
+ '7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
- '6e052f1cb693d5d3203f50f9d4e8c33b')
+ 'a8f4549c716cd37244fbf1ed059497f8')
build() {
cd ${srcdir}/glibc
@@ -69,17 +67,16 @@ build() {
# http://sourceware.org/bugzilla/show_bug.cgi?id=12403
patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
- # https://bugzilla.redhat.com/show_bug.cgi?id=593675
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch
-
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
# http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
+ # Revert commit causing issues with crappy DNS servers...
+ # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
+ # Note that both these patches do not fix the issue completely:
# http://sourceware.org/bugzilla/show_bug.cgi?id=13013
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
+ patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
# re-export RPC interface until libtirpc is ready as a replacement
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
@@ -96,7 +93,7 @@ build() {
# Hack to fix NPTL issues with Xen, only required on 32bit platforms
export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
- echo "slibdir=/usr/lib32" >> configparms
+ echo "slibdir=/lib32" >> configparms
# remove hardening options from CFLAGS for building libraries
CFLAGS=${CFLAGS/-fstack-protector/}
@@ -110,7 +107,7 @@ build() {
--with-tls --with-__thread \
--enable-bind-now --without-gd \
--without-cvs --disable-profile \
- --disable-multi-arch i686-unknown-linux-gnu
+ --enable-multi-arch i686-unknown-linux-gnu
# build libraries with hardening disabled
echo "build-programs=no" >> configparms
@@ -150,19 +147,19 @@ package() {
strip $STRIP_BINARIES usr/lib32/getconf/*
strip $STRIP_STATIC usr/lib32/*.a \
- usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
+ lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
- strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
- usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
- usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
- usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
+ strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+ lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+ lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
+ lib32/{libmemusage,libpcprofile,libSegFault}.so \
usr/lib32/{pt_chown,{audit,gconv}/*.so}
# Dynamic linker
- install -d -m755 ${pkgdir}/lib
- ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/
+ mkdir ${pkgdir}/lib
+ ln -s ../lib32/ld-linux.so.2 ${pkgdir}/lib/
- # Add /usr/lib32 to the default library search path
+ # Add lib32 paths to the default library search path
install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
# Symlink /usr/lib32/locale to /usr/lib/locale
diff --git a/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch
index ee29f8c20..6c9d2718e 100644
--- a/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch
+++ b/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch
@@ -55,7 +55,7 @@ index 9e30594..3890d00 100644
if (old_l_initfini != NULL)
- map->l_orig_initfini = old_l_initfini;
+ _dl_scope_free (old_l_initfini);
- }
+
diff --git a/elf/dl-libc.c b/elf/dl-libc.c
index 7be9483..a13fce3 100644
--- a/elf/dl-libc.c
diff --git a/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
new file mode 100644
index 000000000..11f087cb7
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
@@ -0,0 +1,37 @@
+diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
+--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
+@@ -549,7 +549,7 @@
+ ns, ansp, ansp2, nansp2, resplen2);
+ if (n < 0)
+ return (-1);
+- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
++ if (n == 0)
+ goto next_ns;
+ } else {
+ /* Use datagrams. */
+@@ -559,7 +559,7 @@
+ ansp2, nansp2, resplen2);
+ if (n < 0)
+ return (-1);
+- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
++ if (n == 0)
+ goto next_ns;
+ if (v_circuit)
+ // XXX Check whether both requests failed or
+@@ -1275,14 +1275,10 @@
+ (*thisresplenp > *thisanssizp)
+ ? *thisanssizp : *thisresplenp);
+
+- if (recvresp1 || (buf2 != NULL && recvresp2)) {
+- *resplen2 = 0;
++ if (recvresp1 || (buf2 != NULL && recvresp2))
+ return resplen;
+- }
+ if (buf2 != NULL)
+ {
+- /* No data from the first reply. */
+- resplen = 0;
+ /* We are waiting for a possible second reply. */
+ if (hp->id == anhp->id)
+ recvresp1 = 1;
diff --git a/multilib/lib32-glibc/lib32-glibc.conf b/multilib/lib32-glibc/lib32-glibc.conf
index 9b08c3f43..a1c8c4199 100644
--- a/multilib/lib32-glibc/lib32-glibc.conf
+++ b/multilib/lib32-glibc/lib32-glibc.conf
@@ -1 +1,2 @@
+/lib32
/usr/lib32
diff --git a/multilib/lib32-pcre/PKGBUILD b/multilib/lib32-pcre/PKGBUILD
index 93a5a36a0..63bc0da22 100644
--- a/multilib/lib32-pcre/PKGBUILD
+++ b/multilib/lib32-pcre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45653 2011-04-26 16:31:21Z svenstaro $
+# $Id: PKGBUILD 57529 2011-10-30 08:00:24Z bluewind $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
_pkgbasename=pcre
pkgname=lib32-$_pkgbasename
-pkgver=8.12
+pkgver=8.20
pkgrel=1
pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
arch=('x86_64')
@@ -13,7 +13,7 @@ depends=('lib32-gcc-libs' $_pkgbasename)
makedepends=('gcc-multilib')
options=('!libtool')
source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2)
-md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3')
+md5sums=('a1931c70e1273e3450d5036fe273d25c')
build() {
cd "${srcdir}"/${_pkgbasename}-${pkgver}
diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD
index 1108e49ea..0ab524cef 100644
--- a/multilib/libtool-multilib/PKGBUILD
+++ b/multilib/libtool-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57105 2011-10-21 16:08:22Z ibiru $
+# $Id: PKGBUILD 57527 2011-10-30 06:49:05Z allan $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
@@ -8,12 +8,12 @@
pkgbase=libtool-multilib
pkgname=(libtool-multilib lib32-libltdl)
pkgver=2.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="A generic library support script for multilib"
arch=('x86_64')
url="http://www.gnu.org/software/libtool"
license=('GPL')
-_gccver=4.6.1
+_gccver=4.6.2
makedepends=("gcc-multilib=$_gccver")
options=('!libtool')
source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-25 08:09:46 +0000