From: Stefan Schweizer Date: Sat, 7 Apr 2007 15:49:52 +0000 (+0000) Subject: Fix location for amd64 and remove USE=static, bug 173624 thanks to Georgi Chulkov... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61cf50629df24e21a773437381299fc699549518;p=gentoo.git Fix location for amd64 and remove USE=static, bug 173624 thanks to Georgi Chulkov , Thomas A. (gentoofan23) , philantrop and jakub Package-Manager: portage-2.1.2.3 --- diff --git a/sci-libs/djbfft/ChangeLog b/sci-libs/djbfft/ChangeLog index 923c39b45d43..33a497a4f117 100644 --- a/sci-libs/djbfft/ChangeLog +++ b/sci-libs/djbfft/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/djbfft # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/ChangeLog,v 1.8 2007/02/04 18:26:10 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/ChangeLog,v 1.9 2007/04/07 15:49:52 genstef Exp $ + + 07 Apr 2007; Stefan Schweizer djbfft-0.76.ebuild: + Fix location for amd64 and remove USE=static, bug 173624 thanks to Georgi + Chulkov , Thomas A. (gentoofan23) + , philantrop and jakub 04 Feb 2007; Simon Stelling djbfft-0.76.ebuild: fix multilib-strict; bug 158373 diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest index 0dcbaeb70c3c..bf495e2fd414 100644 --- a/sci-libs/djbfft/Manifest +++ b/sci-libs/djbfft/Manifest @@ -7,14 +7,14 @@ MD5 1f0a753178eb680993ea0bcae7a7fbd2 files/djbfft-0.76-shared.patch 3691 RMD160 ad857ed52974e121b25873cbe9156abf68213d9e files/djbfft-0.76-shared.patch 3691 SHA256 f14b2c9986c97404910b6a67b5e3da9957d6243e9d76e857229313f0e3a491ab files/djbfft-0.76-shared.patch 3691 DIST djbfft-0.76.tar.gz 80092 RMD160 46de3a7ed5d6ca4b245d02a12d969702e57f7381 SHA1 df9d258a75183c10592d937ee2d2befc01a8a0f6 SHA256 799d929c3631a77ef0e16a2449e4fc11af8540b62359f8733ac2899fca2b394c -EBUILD djbfft-0.76.ebuild 1932 RMD160 75c13ec28d25b5a108483259faebd25d709e7276 SHA1 a6fe438bafd93846d4ffbe492b655d8c03e648d6 SHA256 d9295d0625239b6616830ec04a5b9c5c2d9053097cb19bfa54c3b87f8cc131e1 -MD5 69689e36e0aa92f4db4595fb2e6d3826 djbfft-0.76.ebuild 1932 -RMD160 75c13ec28d25b5a108483259faebd25d709e7276 djbfft-0.76.ebuild 1932 -SHA256 d9295d0625239b6616830ec04a5b9c5c2d9053097cb19bfa54c3b87f8cc131e1 djbfft-0.76.ebuild 1932 -MISC ChangeLog 2481 RMD160 be3c89cfd2127b32ad6d0c0dde7a8f2172aad294 SHA1 ae73c253bd649d4d0397ff55ff9054880b7c8214 SHA256 0b0a50bf6ef4cb111b085957a21c4fa12dbe89cad0f60aa908dc7470e9418567 -MD5 ab5a597aab4790fa71153cd7f5891532 ChangeLog 2481 -RMD160 be3c89cfd2127b32ad6d0c0dde7a8f2172aad294 ChangeLog 2481 -SHA256 0b0a50bf6ef4cb111b085957a21c4fa12dbe89cad0f60aa908dc7470e9418567 ChangeLog 2481 +EBUILD djbfft-0.76.ebuild 1787 RMD160 2c7d306fdccc4beb404e695abd3ab84ff36ffdf8 SHA1 66a6f2ef85ef8653b8c8e179ea7f246c99dddd3b SHA256 5602cd98b0e0336c0d4e914bc241fb220d491c93cc06e2492c237955c6e43f07 +MD5 766cf371605e8f655165d6fd48cf5017 djbfft-0.76.ebuild 1787 +RMD160 2c7d306fdccc4beb404e695abd3ab84ff36ffdf8 djbfft-0.76.ebuild 1787 +SHA256 5602cd98b0e0336c0d4e914bc241fb220d491c93cc06e2492c237955c6e43f07 djbfft-0.76.ebuild 1787 +MISC ChangeLog 2741 RMD160 ad40a9fddda8eb8f7c76c72797d4da1e52f5f83f SHA1 1e914340a30cd0a80e9e7562c885ac267440a6de SHA256 efeaaef3cec22dd8be760252b64864f92637d9a7055edc5471f04221b6733e75 +MD5 fea74abda2d45fb50b5d66d0bb72dbb3 ChangeLog 2741 +RMD160 ad40a9fddda8eb8f7c76c72797d4da1e52f5f83f ChangeLog 2741 +SHA256 efeaaef3cec22dd8be760252b64864f92637d9a7055edc5471f04221b6733e75 ChangeLog 2741 MISC metadata.xml 175 RMD160 5f3754ee292086dd228e74d6c8c9cd472e0efd9d SHA1 57aef41bb99efd8a544164a7199ba5a1beff61af SHA256 80a42c113d9f00571ff581635652143b3443d63773c3962624faddee3dc5cec1 MD5 927e1f57b0bbae197566f1d4ed3ee706 metadata.xml 175 RMD160 5f3754ee292086dd228e74d6c8c9cd472e0efd9d metadata.xml 175 diff --git a/sci-libs/djbfft/djbfft-0.76.ebuild b/sci-libs/djbfft/djbfft-0.76.ebuild index fc117a7817d3..f87009d331d1 100644 --- a/sci-libs/djbfft/djbfft-0.76.ebuild +++ b/sci-libs/djbfft/djbfft-0.76.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76.ebuild,v 1.8 2007/02/04 18:26:10 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76.ebuild,v 1.9 2007/04/07 15:49:52 genstef Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz" LICENSE="as-is" SLOT="0" KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="static" +IUSE="" # the "check" target of the Makefile (version 0.76 at least) only checks if # all files were installed with correct permissions. Can't check that at @@ -26,41 +26,31 @@ src_unpack() { ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math" strip-flags - MY_CFLAGS="$CFLAGS -O1 -fomit-frame-pointer" - use x86 && MY_CFLAGS="$MY_CFLAGS -malign-double" + MY_CFLAGS="${CFLAGS} -O1 -fomit-frame-pointer" + use x86 && MY_CFLAGS="${MY_CFLAGS} -malign-double" - if use static ; then - LIBPERMS="0644" - LIBDJBFFT="libdjbfft.a" - else - LIBPERMS="0755" - LIBDJBFFT="libdjbfft.so.${MY_PV}" - fi + LIBPERMS="0755" + LIBDJBFFT="libdjbfft.so.${MY_PV}" - unpack "${A}" + unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-gcc3.patch" epatch "${FILESDIR}/${P}-shared.patch" + sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c - if use static ; then - echo "$(tc-getCC) $MY_CFLAGS" > "conf-cc" - else - echo "$(tc-getCC) $MY_CFLAGS -fPIC -DPIC" > "conf-cc" - fi - echo "$(tc-getCC) $LDFLAGS" > "conf-ld" + echo "$(tc-getCC) $MY_CFLAGS -fPIC -DPIC" > "conf-cc" + echo "$(tc-getCC) ${LDFLAGS}" > "conf-ld" echo "${MY_D}" > "conf-home" einfo "conf-cc: $(