diff options
| author |   Thomas Kuther <gimpel@sonnenkinder.org> | 2009-03-26 15:14:09 +0100 |
|---|---|---|
| committer | Thomas Kuther <gimpel@sonnenkinder.org> | 2009-03-26 15:14:09 +0100 |
| commit | 1388d51ae984d95a2e407d3fff769d7c589cceaa (patch) | |
| tree | a0f75320489a54f2aec0637acce338e5ab29caa2 | |
| parent | fix multilibs typo all over media-libs (diff) | |
| parent | Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay (diff) | |
| download | multilib-portage-1388d51ae984d95a2e407d3fff769d7c589cceaa.tar.gz multilib-portage-1388d51ae984d95a2e407d3fff769d7c589cceaa.tar.bz2 multilib-portage-1388d51ae984d95a2e407d3fff769d7c589cceaa.zip | |
Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay
| -rw-r--r-- | dev-libs/nss/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.12.2.ebuild | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index e21e5598f..98a5638a9 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 4703 RMD160 751d1d0be62d88dd0abbddec812dd82272696030 SHA1 8fab8eb745e68e2bc0faf8f02a23ae46ccbcb5cb SHA256 c6e0a3f2b5ebc25ac8e60be38a3e84beac8da78f495bd78edc6dbf04a4f212e2 +EBUILD nss-3.12.2.ebuild 4831 RMD160 bc793c5d487768a1921c27229fc5952bc7d67ca6 SHA1 d184597856e232ef6a90859b58a2ee523b9da37a SHA256 7ee69c73b68bbcdbd6cd62d719d2e70d0ba5eae0da12fe0e0d64d0c3ac81bc92 diff --git a/dev-libs/nss/nss-3.12.2.ebuild b/dev-libs/nss/nss-3.12.2.ebuild index 30957130a..7e135edc0 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 @@ -55,7 +58,7 @@ multilib-native_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*) ;; |