| 1 |
slyfox 13/08/02 11:29:49 |
| 2 |
|
| 3 |
Modified: ghc-7.6.3-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
unbreak ghci on 7.6.3-r1 on x86 arch. |
| 6 |
|
| 7 |
libc_nonshared.a contains PIC objects while ghci needs non-PIC. |
| 8 |
They are in libc.a. Picked that. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.2 dev-lang/ghc/ghc-7.6.3-r1.ebuild |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.2&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.2&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.1&r2=1.2 |
| 18 |
|
| 19 |
Index: ghc-7.6.3-r1.ebuild |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v |
| 22 |
retrieving revision 1.1 |
| 23 |
retrieving revision 1.2 |
| 24 |
diff -u -r1.1 -r1.2 |
| 25 |
--- ghc-7.6.3-r1.ebuild 1 Aug 2013 13:15:33 -0000 1.1 |
| 26 |
+++ ghc-7.6.3-r1.ebuild 2 Aug 2013 11:29:49 -0000 1.2 |
| 27 |
@@ -1,6 +1,6 @@ |
| 28 |
# Copyright 1999-2013 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $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 $ |
| 31 |
+# $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 $ |
| 32 |
|
| 33 |
# Brief explanation of the bootstrap logic: |
| 34 |
# |
| 35 |
@@ -615,19 +615,12 @@ |
| 36 |
fi # ! use binary |
| 37 |
} |
| 38 |
|
| 39 |
-ghc-needs-c_nonshared-for-interpreter-libs() { |
| 40 |
- local sample_test=${T}/c_nonshared-test.c |
| 41 |
- echo "int main() {} " > "${sample_test}" || die |
| 42 |
- $(tc-getCC) -o "${sample_test}".result "${sample_test}" \ |
| 43 |
- -L"${ROOT}"/usr/$(get_libdir) -lc_nonshared |
| 44 |
-} |
| 45 |
- |
| 46 |
add-c_nonshared-to-ghci-libs() { |
| 47 |
local ghci_lib |
| 48 |
local nonshared_dir=${T}/libc_nonshared_objects |
| 49 |
|
| 50 |
is_crosscompile && return |
| 51 |
- ghc-needs-c_nonshared-for-interpreter-libs || return |
| 52 |
+ use elibc_glibc || return |
| 53 |
|
| 54 |
get-nonshared-objects() { |
| 55 |
# ns - 'nonshared' |
| 56 |
@@ -639,15 +632,18 @@ |
| 57 |
# extract |
| 58 |
mkdir "${nonshared_dir}" || die |
| 59 |
pushd "${nonshared_dir}" >/dev/null || die |
| 60 |
- $(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc_nonshared.a |
| 61 |
+ $(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc.a |
| 62 |
popd >/dev/null || die |
| 63 |
|
| 64 |
+ # they are mostly contents of /usr/$(get_libdir)/libc_nonstahed.a |
| 65 |
+ # but 'c_nonstahed' contains PIC variants of symbols. |
| 66 |
+ # ghci uses non-PIC ones |
| 67 |
for ns_sym in \ |
| 68 |
stat fstat lstat mknod \ |
| 69 |
stat64 fstat64 lstat64 \ |
| 70 |
fstatat fstatat64 mknodat |
| 71 |
do |
| 72 |
- ns_srco=${nonshared_dir}/${ns_sym}.oS |
| 73 |
+ ns_srco=${nonshared_dir}/${ns_sym}.o |
| 74 |
ns_dsto=${nonshared_dir}/${ns_sym}_weakened.o |
| 75 |
[[ -f ${ns_srco} ]] || continue |
| 76 |
# here we do The Magic: |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.246 dev-lang/ghc/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.246&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.246&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.245&r2=1.246 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v |
| 89 |
retrieving revision 1.245 |
| 90 |
retrieving revision 1.246 |
| 91 |
diff -u -r1.245 -r1.246 |
| 92 |
--- ChangeLog 1 Aug 2013 13:15:33 -0000 1.245 |
| 93 |
+++ ChangeLog 2 Aug 2013 11:29:49 -0000 1.246 |
| 94 |
@@ -1,6 +1,10 @@ |
| 95 |
# ChangeLog for dev-lang/ghc |
| 96 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.245 2013/08/01 13:15:33 slyfox Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.246 2013/08/02 11:29:49 slyfox Exp $ |
| 99 |
+ |
| 100 |
+ 02 Aug 2013; Sergei Trofimovich <slyfox@g.o> ghc-7.6.3-r1.ebuild: |
| 101 |
+ unbreak ghci on 7.6.3-r1 on x86 arch. libc_nonshared.a contains PIC objects |
| 102 |
+ while ghci needs non-PIC. They are in libc.a. Picked that. |
| 103 |
|
| 104 |
*ghc-7.6.3-r1 (01 Aug 2013) |
Archives