From 251bbca3226aa35c5db3bccc6fd64be8d30ca4c3 Mon Sep 17 00:00:00 2001 From: Steven J Newbury Date: Wed, 25 Mar 2009 13:00:03 +0000 Subject: dev-libs/nss: Disable -m32/-m64 in Linux.mk, since it breaks multilib build. LDFLAGS now provides the flag, and the ebuild already modifies the rules.mk to respect that. --- dev-libs/nss/Manifest | 2 +- dev-libs/nss/nss-3.12.2.ebuild | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 4b5813726..7c245e856 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -4,4 +4,4 @@ AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 S AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7 AUX nss-mips64-2.patch 540 RMD160 16c461f453470238922065068dd6530b908bb64f SHA1 27062b98164c946d5116b64a49c7c164b261fdbd SHA256 06ad64812bd49382ff4165bfa452fd697a5ca2c03e8f3ffb9aa1bcfa14499b34 DIST nss-3.12.2.tar.bz2 3974864 RMD160 eebddb26f26268550d106301464e0f98944a5e04 SHA1 a668ddb8e80c90aaa6d958f85745c6595a493f38 SHA256 84fb75ded8db4a4a38cb12a7aeeeade4fed68ff0f5e9f069ffe021d3b36f94a4 -EBUILD nss-3.12.2.ebuild 4700 RMD160 bbf5cb03dcd8e6501a5dcb13505dc2f8a5c781ee SHA1 a1afd0c064b9c4f083a1885a9ec01186f602e54e SHA256 846f7b97fb236cd3d3588199d0e1be83e40275b4ea68ddb8f17039baef9adad6 +EBUILD nss-3.12.2.ebuild 4818 RMD160 93cd031245693770ad0f7cefdfc137875e1f08d0 SHA1 04705d5438b5191ecce7b692a1c7f028d7c4430c SHA256 3234a29507dcc29223f20385a240f22d7df59e4898a0c9e7ef891d342a6c85ed diff --git a/dev-libs/nss/nss-3.12.2.ebuild b/dev-libs/nss/nss-3.12.2.ebuild index 8abb989f5..fbd1b8db8 100644 --- a/dev-libs/nss/nss-3.12.2.ebuild +++ b/dev-libs/nss/nss-3.12.2.ebuild @@ -43,6 +43,9 @@ src_unpack() { # Respect LDFLAGS sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + # do not always append -m64/-m32 on 64bit since it breaks multilib build + sed -i -e '/ARCHFLAG.*=/s:^:# :' Linux.mk + cd "${S}" epatch "${FILESDIR}"/${PN}-3.11-config.patch epatch "${FILESDIR}"/${PN}-3.12-config-1.patch -- cgit v1.2.3-65-gdbad From d7a27120f429434c80b01d14a84886dc9838bc6e Mon Sep 17 00:00:00 2001 From: Steven J Newbury Date: Thu, 26 Mar 2009 12:28:21 +0000 Subject: dev-libs/nss: Use CFLAGS when compiling word size test --- dev-libs/nss/Manifest | 2 +- dev-libs/nss/nss-3.12.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 7c245e856..22bb65030 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -4,4 +4,4 @@ AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 S AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7 AUX nss-mips64-2.patch 540 RMD160 16c461f453470238922065068dd6530b908bb64f SHA1 27062b98164c946d5116b64a49c7c164b261fdbd SHA256 06ad64812bd49382ff4165bfa452fd697a5ca2c03e8f3ffb9aa1bcfa14499b34 DIST nss-3.12.2.tar.bz2 3974864 RMD160 eebddb26f26268550d106301464e0f98944a5e04 SHA1 a668ddb8e80c90aaa6d958f85745c6595a493f38 SHA256 84fb75ded8db4a4a38cb12a7aeeeade4fed68ff0f5e9f069ffe021d3b36f94a4 -EBUILD nss-3.12.2.ebuild 4818 RMD160 93cd031245693770ad0f7cefdfc137875e1f08d0 SHA1 04705d5438b5191ecce7b692a1c7f028d7c4430c SHA256 3234a29507dcc29223f20385a240f22d7df59e4898a0c9e7ef891d342a6c85ed +EBUILD nss-3.12.2.ebuild 4828 RMD160 24324da53cb355f3a22f548d8c80750ca06bdf2b SHA1 5c34dea2b91739193c1dd9ef4314f8265e689a66 SHA256 f7185d3a08dda1bbe30d0e14ecb6a8b2377d5c6de9245504e2898b595dac4f46 diff --git a/dev-libs/nss/nss-3.12.2.ebuild b/dev-libs/nss/nss-3.12.2.ebuild index fbd1b8db8..79a16270f 100644 --- a/dev-libs/nss/nss-3.12.2.ebuild +++ b/dev-libs/nss/nss-3.12.2.ebuild @@ -58,7 +58,7 @@ multilib-xlibs_src_compile_internal() { strip-flags echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o case $(file "${T}"/test.o) in *64-bit*) export USE_64=1;; *32-bit*) ;; -- cgit v1.2.3-65-gdbad