From 1982ae8d63ab142a2a16bdf1b055110d9c9f40fd Mon Sep 17 00:00:00 2001 From: root Date: Thu, 12 May 2011 22:37:15 +0000 Subject: Thu May 12 22:37:08 UTC 2011 --- multilib-testing/binutils-multilib/PKGBUILD | 81 ++++++++++++++++++ .../binutils-2.21-strip-segfault.patch | 96 ++++++++++++++++++++++ .../binutils-multilib/binutils.install | 17 ++++ 3 files changed, 194 insertions(+) create mode 100644 multilib-testing/binutils-multilib/PKGBUILD create mode 100644 multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch create mode 100644 multilib-testing/binutils-multilib/binutils.install (limited to 'multilib-testing') diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD new file mode 100644 index 000000000..78be6ccc6 --- /dev/null +++ b/multilib-testing/binutils-multilib/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 46786 2011-05-11 15:43:26Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Allan McRae + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc + +pkgname=binutils-multilib +pkgver=2.21 +pkgrel=8 +_date=20110430 +pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" +arch=('x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +groups=('multilib-devel') +provides=("binutils=$pkgver-$pkgrel") +conflicts=('binutils') +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 + 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 + + ${srcdir}/binutils/configure --prefix=/usr \ + --enable-ld=default --enable-gold \ + --enable-plugins --enable-threads \ + --enable-shared \ + --enable-64-bit-bfd --enable-multilib + + # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + make configure-host + + make tooldir=${pkgdir}/usr +} + +check() { + cd ${srcdir}/binutils-build + + # do not abort on errors - manually check log files + make -k -j1 check || true +} + +package() { + cd ${srcdir}/binutils-build + make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install + + # Add some useful headers + install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include + install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include + + # Rebuild libiberty.a with -fPIC + make -C libiberty clean + make CFLAGS="$CFLAGS -fPIC" -C libiberty + install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib + + # Rebuild libbfd.a with -fPIC + make -C bfd clean + # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API + make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd + install -m644 bfd/libbfd.a ${pkgdir}/usr/lib + + # Remove Windows/Novell specific man pages + rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* + + # Remove these symlinks, they are not ABI stable. + # Programs should compile static to the .a file. + rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so + echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so + echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so +} diff --git a/multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch b/multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch new file mode 100644 index 000000000..0133d879b --- /dev/null +++ b/multilib-testing/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-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install new file mode 100644 index 000000000..8bf9f3a47 --- /dev/null +++ b/multilib-testing/binutils-multilib/binutils.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + -- cgit v1.2.3-54-g00ecf