diff options
| author | BlackNoxis <steven.darklight@gmail.com> | 2015-07-12 14:54:44 +0300 |
|---|---|---|
| committer | BlackNoxis <steven.darklight@gmail.com> | 2015-07-12 14:54:44 +0300 |
| commit | 0358c5804e72055d4b5ba5fef32ea0946fcb0bcd (patch) | |
| tree | f968e069faf7f2a696786ca6841156d8b3fccb54 | |
| parent | 8c13cca6ba63f70e1caeb90e5fbaf8be64d449b3 (diff) | |
| parent | 88eb655aafe09dd8feeb92952d27520a8ae56ac2 (diff) | |
Merge remote-tracking branch 'venerix/master'
| -rw-r--r-- | sys-devel/base-gcc/Manifest | 1 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-4.8.4.ebuild | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys-devel/base-gcc/Manifest b/sys-devel/base-gcc/Manifest index 054a4a65..b2331445 100644 --- a/sys-devel/base-gcc/Manifest +++ b/sys-devel/base-gcc/Manifest @@ -1,3 +1,4 @@ +DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e DIST gcc-4.8.4-patches-1.6.tar.bz2 26041 SHA256 a7c543351ef7fe81a6c6a8cde7a0c8351935841b85a4799a2e0bd2dc9c6f4d7b SHA512 077e07f5af576ec05e4db7399eb4070da52b0060443ce1f73f2b9ac981318fb20abaf2e898a3b4c612dec3fe07b24ecd0fd0a0ecdd3609ad21bec77f67225aae WHIRLPOOL f9d5feb257c24a5222b8a52c4cd9d828e8efb3595acb5c0c7367a3980a473c065aae64600ec8fc29954f68fa628641d68b2663eec45ddbbbbcd27a7dc775f8a1 DIST gcc-4.8.4-piepatches-v0.6.1.tar.bz2 14110 SHA256 558bd1babcd687979ef6269b8e4774a3a06b860bda44e0a8aafaaa55423574b4 SHA512 464c7c482a244f6e3d07beb0bbe6d007bb95502d76d08dbb9daca92bcdb4560571f85eb10a73f542a03d1c7ba90fd1e50cfb8220f933ef559ff6f7867bc8bbdc WHIRLPOOL cc3ab1819905a32dd5983d1fae5c6812343c1426ec3ef387c56eaf46c73c646e376ae6351a151bd5579393be5055a231cb94e29ab03051f729ad4c685e69b77f diff --git a/sys-devel/gcc/gcc-4.8.4.ebuild b/sys-devel/gcc/gcc-4.8.4.ebuild index e3a121f7..9b3359b3 100644 --- a/sys-devel/gcc/gcc-4.8.4.ebuild +++ b/sys-devel/gcc/gcc-4.8.4.ebuild @@ -49,15 +49,15 @@ src_prepare() { src_install() { toolchain_src_install # drop base gcc libraries, they're provided by sys-devel/base-gcc-${PV} - # - # TODO , prevent dropping of headers - # export local libdir="${D}usr/lib/gcc/$(uname -m)-pc-linux-gnu/${PV}" if use multilib ; then export local multilibdir="${D}usr/lib/gcc/$(uname -m)-pc-linux-gnu/${PV}/32" fi - - rm -rf "$libdir" + + # if we remove whole libdir, headers are gone, so remove only libs and their symlinks + find "$libdir" -maxdepth 1 -type f -delete + find "$libdir" -maxdepth 1 -type l -delete + # however, removing multilibdir as a whole doesn't cause any problems if use multilib ; then rm -rf "$multilibdir" fi |