From 3b5c4b506d3636dd006395d58d44f4154a38f20f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 22 Oct 2008 04:07:58 +0200 Subject: [PATCH] gcc: install libs into /lib and not /lib64 on x86_64. This is to mimic what debian and derivatives do. --HG-- extra : convert_revision : 02e15adf1f06ba45f14f06aad9c28ac4553c8621 --- templates/gcc-fix-amd64.diff | 16 ++++++++++++++++ templates/gcc.tmpl | 6 ++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 templates/gcc-fix-amd64.diff diff --git a/templates/gcc-fix-amd64.diff b/templates/gcc-fix-amd64.diff new file mode 100644 index 0000000000..c576c20e1c --- /dev/null +++ b/templates/gcc-fix-amd64.diff @@ -0,0 +1,16 @@ +Override default to match what other debian derivatives do. + +Rather than having lib being a link of lib64, do the the contrary: +use lib and make lib64 a link of it. + +--- gcc/config/i386/t-linux64.orig 2008-10-22 03:33:48.513859286 +0200 ++++ gcc/config/i386/t-linux64 2008-10-22 03:34:27.928844912 +0200 +@@ -13,7 +13,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib diff --git a/templates/gcc.tmpl b/templates/gcc.tmpl index 80bbb9493e..4319a57fea 100644 --- a/templates/gcc.tmpl +++ b/templates/gcc.tmpl @@ -1,14 +1,16 @@ # Template build file for 'gcc' pkgname=gcc version=4.3.2 +patch_files="$pkgname-fix-amd64.diff" distfiles=" http://ftp.gnu.org/pub/gnu/gcc/$pkgname-$version/$pkgname-$version@.tar.bz2" build_style=gnu_configure configure_args="--enable-clocale=gnu --disable-bootstrap --enable-threads=posix --enable-__cxa_atexit --disable-multilib - --enable-languages=c,c++,objc,obj-c++ + --enable-languages=c,c++,objc,obj-c++ --enable-tls --with-local-prefix=$XBPS_DESTDIR/$pkgname-$version - --with-mpfr=$XBPS_MASTERDIR/usr --with-gmp=$XBPS_MASTERDIR/usr" + --with-mpfr=$XBPS_MASTERDIR/usr --with-gmp=$XBPS_MASTERDIR/usr + --disable-rpath --with-system-zlib" short_desc="The GNU C Compiler suite" maintainer="Juan RP " checksum=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165