mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-26 19:13:51 +02:00
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
This commit is contained in:
parent
a193527922
commit
3b5c4b506d
2 changed files with 20 additions and 2 deletions
16
templates/gcc-fix-amd64.diff
Normal file
16
templates/gcc-fix-amd64.diff
Normal file
|
@ -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
|
|
@ -1,14 +1,16 @@
|
||||||
# Template build file for 'gcc'
|
# Template build file for 'gcc'
|
||||||
pkgname=gcc
|
pkgname=gcc
|
||||||
version=4.3.2
|
version=4.3.2
|
||||||
|
patch_files="$pkgname-fix-amd64.diff"
|
||||||
distfiles="
|
distfiles="
|
||||||
http://ftp.gnu.org/pub/gnu/gcc/$pkgname-$version/$pkgname-$version@.tar.bz2"
|
http://ftp.gnu.org/pub/gnu/gcc/$pkgname-$version/$pkgname-$version@.tar.bz2"
|
||||||
build_style=gnu_configure
|
build_style=gnu_configure
|
||||||
configure_args="--enable-clocale=gnu --disable-bootstrap
|
configure_args="--enable-clocale=gnu --disable-bootstrap
|
||||||
--enable-threads=posix --enable-__cxa_atexit --disable-multilib
|
--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-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"
|
short_desc="The GNU C Compiler suite"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
checksum=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
|
checksum=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
|
||||||
|
|
Loading…
Add table
Reference in a new issue