diff options
Diffstat (limited to 'multilib')
| -rw-r--r-- | multilib/binutils-multilib/PKGBUILD | 14 | ||||
| -rw-r--r-- | multilib/binutils-multilib/binutils-2.21-strip-segfault.patch | 96 | ||||
| -rw-r--r-- | multilib/gcc-multilib/PKGBUILD | 20 | ||||
| -rw-r--r-- | multilib/nspluginwrapper/PKGBUILD | 6 |
4 files changed, 118 insertions, 18 deletions
diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD index d561a25da..78be6ccc6 100644 --- a/multilib/binutils-multilib/PKGBUILD +++ b/multilib/binutils-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46021 2011-05-02 00:26:22Z heftig $ +# $Id: PKGBUILD 46786 2011-05-11 15:43:26Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=binutils-multilib pkgver=2.21 -pkgrel=7 +pkgrel=8 _date=20110430 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" arch=('x86_64') @@ -19,10 +19,16 @@ depends=('glibc>=2.13' 'zlib') makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) -md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec') +source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2 + binutils-2.21-strip-segfault.patch) +md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec' + '98e8dfaf1c0ededa586823ebfb27825a') build() { + cd ${srcdir}/binutils + # http://sourceware.org/bugzilla/show_bug.cgi?id=12632 + patch -Np1 -i $srcdir/binutils-2.21-strip-segfault.patch + cd ${srcdir} mkdir binutils-build && cd binutils-build diff --git a/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch b/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch new file mode 100644 index 000000000..0133d879b --- /dev/null +++ b/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch @@ -0,0 +1,96 @@ +diff --git a/binutils/objcopy.c b/binutils/objcopy.c +index 15c4f95..b64f3d0 100644 +--- a/binutils/objcopy.c ++++ b/binutils/objcopy.c +@@ -1,6 +1,6 @@ + /* objcopy.c -- copy object file from input to output, optionally massaging it. + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. + + This file is part of GNU Binutils. +@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + struct stat buf; + int stat_status = 0; + bfd_boolean del = TRUE; ++ bfd_boolean ok_object; + + /* Create an output file for this member. */ + output_name = concat (dir, "/", +@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + l->obfd = NULL; + list = l; + +- if (bfd_check_format (this_element, bfd_object)) ++ ok_object = bfd_check_format (this_element, bfd_object); ++ if (!ok_object) ++ bfd_nonfatal_message (NULL, this_element, NULL, ++ _("Unable to recognise the format of file")); ++ ++ /* PR binutils/3110: Cope with archives ++ containing multiple target types. */ ++ if (force_output_target || !ok_object) ++ output_bfd = bfd_openw (output_name, output_target); ++ else ++ output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ ++ if (output_bfd == NULL) + { +- /* PR binutils/3110: Cope with archives +- containing multiple target types. */ +- if (force_output_target) +- output_bfd = bfd_openw (output_name, output_target); +- else +- output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ status = 1; ++ return; ++ } ++ ++ if (ok_object) ++ { ++ del = !copy_object (this_element, output_bfd, input_arch); + +- if (output_bfd == NULL) ++ if (del && bfd_get_arch (this_element) == bfd_arch_unknown) ++ /* Try again as an unknown object file. */ ++ ok_object = FALSE; ++ else if (!bfd_close (output_bfd)) + { + bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ /* Error in new object file. Don't change archive. */ + status = 1; +- return; + } +- +- del = ! copy_object (this_element, output_bfd, input_arch); +- +- if (! del +- || bfd_get_arch (this_element) != bfd_arch_unknown) +- { +- if (!bfd_close (output_bfd)) +- { +- bfd_nonfatal_message (output_name, NULL, NULL, NULL); +- /* Error in new object file. Don't change archive. */ +- status = 1; +- } +- } +- else +- goto copy_unknown_element; + } +- else +- { +- bfd_nonfatal_message (NULL, this_element, NULL, +- _("Unable to recognise the format of file")); + +- output_bfd = bfd_openw (output_name, output_target); +-copy_unknown_element: ++ if (!ok_object) ++ { + del = !copy_unknown_object (this_element, output_bfd); + if (!bfd_close_all_done (output_bfd)) + { +-- +1.6.5.GIT + diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 4a5a69628..98dcef2a4 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46019 2011-05-02 00:10:26Z heftig $ +# $Id: PKGBUILD 47043 2011-05-14 11:08:03Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,8 +8,8 @@ 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.0 -pkgrel=4 -_snapshot=4.6-20110429 +pkgrel=5 +_snapshot=4.6-20110513 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') @@ -23,13 +23,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran, ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('fa586a5634ae3b462c5fb2d55160b14f' - '2591b1fad977f7bd6136c9ac1298ef04' - '366f93c1867f35c8860b42965efde955' - '21779792ef7e0ed7abef611160b0099c' - 'cf518c56b968925a2eca3aa2b4cdbd7b' - 'f66ef8597b99961eda7573df505ea354' - '3d89dd233ceb6a837d14ee6b940a43ed' +md5sums=('2be769db16ac02f30fb62423b4c50145' + 'a310d230945f4b3093dd3ca72839c649' + '361a10c5a5545c80fd271b18036dd00c' + 'f7db2f6ed34398361de62cb6b8eb53d2' + '9b69c1d8874e8496c1965ee3e32eaa6d' + '248e53b461078bf1c89528fb8e4ba051' + 'e15a01b0d02ff12e975e4c2649e71e55' '1e9fd2eaf0ee47ea64e82c48998f1999' '22cec272f9cc2801d3cd348feaca888b' '4df25b623799b148a0703eaeec8fdf3f') diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD index c037f2d98..b81bee1e0 100644 --- a/multilib/nspluginwrapper/PKGBUILD +++ b/multilib/nspluginwrapper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 47097 2011-05-16 17:45:22Z bluewind $ +# $Id: PKGBUILD 47136 2011-05-17 17:28:43Z bluewind $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=nspluginwrapper pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform NPAPI compatible plugin viewer" arch=('x86_64') url="http://nspluginwrapper.davidben.net/" @@ -28,8 +28,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir/" install - mkdir -p "$pkgdir"/usr/lib/mozilla/plugins/ - ln -s /usr/lib/nspluginwrapper/x86_64/linux/npwrapper.so "$pkgdir"/usr/lib/mozilla/plugins/ } # vim:set ts=2 sw=2 et: |