diff options
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/Manifest | 12 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.6.3-r1.ebuild | 18 |
3 files changed, 18 insertions, 18 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index f4fac98b08c4..920c3fcb62af 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.245 2013/08/01 13:15:33 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.246 2013/08/02 11:29:49 slyfox Exp $ + + 02 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild: + unbreak ghci on 7.6.3-r1 on x86 arch. libc_nonshared.a contains PIC objects + while ghci needs non-PIC. They are in libc.a. Picked that. *ghc-7.6.3-r1 (01 Aug 2013) diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index c6779114b30f..d8228775d46f 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -96,14 +96,14 @@ EBUILD ghc-7.4.1-r1.ebuild 21255 SHA256 bd888b9945bed390b0c672dca385360df9326d84 EBUILD ghc-7.4.1.ebuild 20450 SHA256 8a0a3b104ddbb23c2de1128b60f194108739330d35bafc4c8349f62113a759c9 SHA512 cc9d7089457d89f405e35fd11dc991d8d3f8494b8bbb871bbbddab32c0bee2f12eb5f679b494053947228fd11d07c41a0d876f33eab4d7138feb4626b0293b1a WHIRLPOOL bff6571901c923e161667aaf9c63f027e33967372e4d86711774c33dfcb26adf0f75a9995a9dd20ce0996bf984ed43c4825a395a65cba7a615aadce86bbaa5da EBUILD ghc-7.4.2.ebuild 22001 SHA256 15b549a62e8d7ca1d47602cb3f528b5aa30cfc5a809827d7b4c5b79cdcd9d5bf SHA512 d0a5340fea4ba407f44114f985619c966f2d2a1887f8030ef1dd62cfd8920e486bbc6003d7f466280b314f34005ec75154b590e6071d1fd5165f68326bb5fdce WHIRLPOOL 3baccfff4a0fcf09e39e37d2c7f233c739007ba1c6dba746418df2fc3b75e9b2a1530d3dc12e831bfd2cccb76eb76f7932bdeef252046daf7e16007071cebc6c EBUILD ghc-7.6.2.ebuild 25247 SHA256 5a4b1fed20453edf0e09af3c9c5eac979e76b99b64e60d94e5704cbc4949440c SHA512 d22b5e8e67f4fb4003d2b008c21bab276bf872d7f806745132c957bf0227412d783953a16dbd5697fc28f0f83f3a7c9e55a59cd2825de21ce07e937bf4580577 WHIRLPOOL 994841dbdfdb212ad5a8594c62c7c5679ff58bfb421bde5567f0f025ee4fc0fdc5846262d40bb4506f5665d26278dca8e5a7ba3c6325809c665198233c847b7b -EBUILD ghc-7.6.3-r1.ebuild 28640 SHA256 3436b817135c8c59f217d244c41359aea359bbc95ad88cc937cb2d900a965103 SHA512 60b7af3f32cad2668435945916cac571817b31c1ef8a4c4ad6fc06994532c9aa02c7eecd7f14be8fa3b5a8b3cc0c6dcbedae7d138511ddd1d6f1ceca57b3602b WHIRLPOOL 98975f4c3f25f5f8e11b4d5fcaead494796ae475695c7dd1cad331df066886799ae11cb2c8a0e884d03eb6894b74eec92e55bb1e37dced7ca4312774e4af465b +EBUILD ghc-7.6.3-r1.ebuild 28506 SHA256 ded0832f1e10cf1944f584a3ba8e2a40adb6a1b22b8dc3fcdb2bdc04abd48f74 SHA512 5bed1256a7fd83d0d550a08db188e20f73df62b2ff64f6fdf2255f98e7d497b6107d00aec786266f050dccf02c65a601f562cf13f93af42004ceab5d2b29fb2d WHIRLPOOL 0061acd215778878ea39a0aae63b9f10ec1e0bb7853138f76de85989a680a4e183a6803c8d45f1705424c052b202af36bc0a5fdf939d08fb64a2f477de4970b0 EBUILD ghc-7.6.3.ebuild 26135 SHA256 15b0b4d9f7bb21507cdbad648811e3cc3cf2fe8d92b94e1a78f6f7c007c88a06 SHA512 8e02d5251b96bd3eed6c2a5bd24d85badf7d3b427c42c7309061aec64b7588a674901fbcae59441a9c814eb2d6e2e0993b511354dbbbbe3c0221617ca804e736 WHIRLPOOL 5e688fe4971bc486b79250c03fcc71c54353505ac93861ef514238af7519032db3f30f7e95237b1eca6baf80f71f8c2d69f5dde9a7b21965a6fe83df7fff9b4a -MISC ChangeLog 44786 SHA256 df478d0b94b291a3c5a465b0692a5e69e43963143a1e250d65f9df05336c47e1 SHA512 a7275ffcfe87487179e620d63175e690d0f65092b37e1957fb0f4de7f56930602e62a4f0265b9ba41031d6d8773f29f5706276ee84508813c52b35fdedb69d82 WHIRLPOOL 383d1858a9e896a6c14571a6c8feace156fd85e55e82560057be500a3dcf2d1fa1e9101b61a6f90f3f32b85244c5abc6ac092fe91d5e2b29fd96ab84e54ee04b +MISC ChangeLog 45002 SHA256 7686757b607b1e2856938c6beef773a3e8b1449ea1f0fbffc0624790d03f8e71 SHA512 aa837f4ef8a565cbeb69a5112736b10e9f1ef09ac5cfbb2849c4868ad1b7f352828ac682d6d1594024a5321fe5f10c9a9ef410a49b9cc19684b5f2cb31304fff WHIRLPOOL 1d4ad792d69aff2ed97371adad9a1d1cb9c412dce59dff697127b03178a8ad4b948d8db3564fc88f9b7da99f2501e73551f54b3d443decba5419b216f39f9f06 MISC metadata.xml 626 SHA256 ef2d6b7e65453f0a6df403c25925250c8308741aa82b5991cfe18f5c1d8ab406 SHA512 9647b53b295e2f586c46450c068e3d0b5ebf2790b091121df7e177e7155f8ef4124df1fedc805465c24d9d32703398e1761de407b5bc494ba05fb76de2c7069a WHIRLPOOL 55afff88759648d2c47293046ddc2a10f92e2986bfb2d83d31046b824c6bab432038fe3298d29be434bfd1f13b368e5cc9b99eebc295443d53400e0eca4070b7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlH6X3cACgkQcaHudmEf86q6XACfYCeSH2Eu/K9RsVYfjaJVJkvg -FLIAnRDTHItA/QHWuvNvj64DA/SN0La3 -=45au +iEYEAREIAAYFAlH7l4AACgkQcaHudmEf86rZ6gCfa/ZOddM8U8wUjMIpuCVY+LE2 +GHEAnjpt7MH0kpHZANOtSGQI368syXOs +=k+Fg -----END PGP SIGNATURE----- diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild index b693c3524d36..c18fca740127 100644 --- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild +++ b/dev-lang/ghc/ghc-7.6.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.1 2013/08/01 13:15:33 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.2 2013/08/02 11:29:49 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -615,19 +615,12 @@ src_compile() { fi # ! use binary } -ghc-needs-c_nonshared-for-interpreter-libs() { - local sample_test=${T}/c_nonshared-test.c - echo "int main() {} " > "${sample_test}" || die - $(tc-getCC) -o "${sample_test}".result "${sample_test}" \ - -L"${ROOT}"/usr/$(get_libdir) -lc_nonshared -} - add-c_nonshared-to-ghci-libs() { local ghci_lib local nonshared_dir=${T}/libc_nonshared_objects is_crosscompile && return - ghc-needs-c_nonshared-for-interpreter-libs || return + use elibc_glibc || return get-nonshared-objects() { # ns - 'nonshared' @@ -639,15 +632,18 @@ add-c_nonshared-to-ghci-libs() { # extract mkdir "${nonshared_dir}" || die pushd "${nonshared_dir}" >/dev/null || die - $(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc_nonshared.a + $(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc.a popd >/dev/null || die + # they are mostly contents of /usr/$(get_libdir)/libc_nonstahed.a + # but 'c_nonstahed' contains PIC variants of symbols. + # ghci uses non-PIC ones for ns_sym in \ stat fstat lstat mknod \ stat64 fstat64 lstat64 \ fstatat fstatat64 mknodat do - ns_srco=${nonshared_dir}/${ns_sym}.oS + ns_srco=${nonshared_dir}/${ns_sym}.o ns_dsto=${nonshared_dir}/${ns_sym}_weakened.o [[ -f ${ns_srco} ]] || continue # here we do The Magic: |