diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 09:32:17 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 09:32:17 +0100 |
| commit | f5c086718dccf990c03ac0d3327fa4083335487d (patch) | |
| tree | eee79fd7ba32acdb43b11131b36f3a3221f2289a /sci-libs | |
| parent | media-sound/gsm needs MULTILIB_IN_SOURCE_BUILD (diff) | |
| download | multilib-portage-f5c086718dccf990c03ac0d3327fa4083335487d.tar.gz multilib-portage-f5c086718dccf990c03ac0d3327fa4083335487d.tar.bz2 multilib-portage-f5c086718dccf990c03ac0d3327fa4083335487d.zip | |
Fix sci-libs/djbfft: CFLAGS are stored in a file in the source tree,
it needs to be written for each ABI so move generation of files to
src_prepare from pkg_setup. Also ensure -m32, and -m64 are not
filtered.
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/djbfft/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/djbfft/djbfft-0.76-r1.ebuild | 13 | ||||
| -rw-r--r-- | sci-libs/djbfft/djbfft-0.76.ebuild | 12 |
3 files changed, 16 insertions, 13 deletions
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest index 19c974809..c4ba7c4b9 100644 --- a/sci-libs/djbfft/Manifest +++ b/sci-libs/djbfft/Manifest @@ -2,7 +2,7 @@ AUX djbfft-0.76-gcc3.patch 1176 RMD160 8c49fb74f011c329c13dcb7bbe7891d1f3d5a7aa AUX djbfft-0.76-headers.patch 995 RMD160 67d48046060923882a40aab7d8b51962dc0a9c96 SHA1 c5403ccae24f90ba3dbe65b08c8145284691e309 SHA256 783ef6cf4b82af55efc6d038aa0fe2f76c81dcd52393444fa0ca438c9ebee483 AUX djbfft-0.76-shared.patch 3722 RMD160 a958cf5bf50e41240d5bb59d46da330ed31abbf2 SHA1 9e41f833045be02d8fb951d4df1944b27b50f23a SHA256 bbe7f027a29428265e44d4f966808b4d752c523c340d13d8f037233bc45e6ad1 DIST djbfft-0.76.tar.gz 80092 RMD160 46de3a7ed5d6ca4b245d02a12d969702e57f7381 SHA1 df9d258a75183c10592d937ee2d2befc01a8a0f6 SHA256 799d929c3631a77ef0e16a2449e4fc11af8540b62359f8733ac2899fca2b394c -EBUILD djbfft-0.76-r1.ebuild 2096 RMD160 a6dfd707a47737a2211edc40a6f69637500ef109 SHA1 27bcb063ccf15f0bbb8385f5a65fc51a2211ff11 SHA256 1ecac93e5243218c35bf51b1a65cce9e1ec930dc4491f9819983c79fa35fd2ad -EBUILD djbfft-0.76.ebuild 1921 RMD160 760c57dc5caf2699219b504053b9c422cd1acf8d SHA1 1978b4a89a1484244b946931928ad4f51b5d602a SHA256 23ecb12df1854539127018d66b2a75680dd4c06ef5ad16e07fe3b5528c69e8b4 +EBUILD djbfft-0.76-r1.ebuild 2109 RMD160 fbba9cfd55f573d7b433dd3ff93a5c004944415f SHA1 89463673b983b3cd61984bce81a3cba7e314e0a0 SHA256 684e14eb40eeb02a120b34e4255dab16176fb49176e1370c8a6658a69b1595cd +EBUILD djbfft-0.76.ebuild 1943 RMD160 ef7d4e321378d0db44540a2645cbbc43cba9e714 SHA1 6adff54e5b06a0079d8748ec090249d45fa17916 SHA256 366d2c4d616fa1ed0fc0e9fa7cdecb4e9bbde64f55af64ce0fdc1277b4e1b7dc MISC ChangeLog 3167 RMD160 bfb4d0ffb2c34006783a6f12a91c8fb37600a7e1 SHA1 20962709d0e2070e4e46927b3875592b073954c8 SHA256 3f23092aeb3e4277c3480175bcef4d6e6310723461890f62a2e6d1f797be0f79 MISC metadata.xml 628 RMD160 ca1ccd6951c4a98395e8f739275320727a0f3136 SHA1 d57f886a3f35612e176bf8876af99dd81f68f021 SHA256 d7aa1200cc1fa91800f0196bd6bbf0298f63d6669184e27e311fe075ee14f58c diff --git a/sci-libs/djbfft/djbfft-0.76-r1.ebuild b/sci-libs/djbfft/djbfft-0.76-r1.ebuild index 371fae222..2d9f3b05d 100644 --- a/sci-libs/djbfft/djbfft-0.76-r1.ebuild +++ b/sci-libs/djbfft/djbfft-0.76-r1.ebuild @@ -21,8 +21,13 @@ pkg_setup() { MY_PV="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c MY_D="${D}usr" + LIBPERMS="0755" + LIBDJBFFT="libdjbfft.so.${MY_PV}" +} + +multilib-native_src_prepare_internal() { # mask out everything, which is not suggested by the author (RTFM)! - ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math" + ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math -m32 -m64" strip-flags # why? @@ -30,12 +35,8 @@ pkg_setup() { MY_CFLAGS="${CFLAGS}" use x86 && MY_CFLAGS="${CFLAGS} -malign-double" - LIBPERMS="0755" - LIBDJBFFT="libdjbfft.so.${MY_PV}" -} + cd "${S}" -multilib-native_src_prepare_internal() { - cd ${S} epatch "${FILESDIR}/${P}-gcc3.patch" epatch "${FILESDIR}/${P}-shared.patch" epatch "${FILESDIR}/${P}-headers.patch" diff --git a/sci-libs/djbfft/djbfft-0.76.ebuild b/sci-libs/djbfft/djbfft-0.76.ebuild index 003433f47..109e1d7be 100644 --- a/sci-libs/djbfft/djbfft-0.76.ebuild +++ b/sci-libs/djbfft/djbfft-0.76.ebuild @@ -26,18 +26,20 @@ pkg_setup() { MY_PV="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c MY_D="${D}usr" + LIBPERMS="0755" + LIBDJBFFT="libdjbfft.so.${MY_PV}" +} + +multilib-native_src_prepare_internal() { # mask out everything, which is not suggested by the author (RTFM)! - ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math" + ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math -m32 -m64" strip-flags MY_CFLAGS="${CFLAGS} -O1 -fomit-frame-pointer" use x86 && MY_CFLAGS="${MY_CFLAGS} -malign-double" - LIBPERMS="0755" - LIBDJBFFT="libdjbfft.so.${MY_PV}" -} + cd "${S}" -multilib-native_src_prepare_internal() { epatch "${FILESDIR}/${P}-gcc3.patch" epatch "${FILESDIR}/${P}-shared.patch" |