1 |
grobian 12/04/30 15:09:25 |
2 |
|
3 |
Modified: llvm-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Extract the version LLVM refers to internally so we can properly fix install_names on Darwin, bug #412137 |
6 |
|
7 |
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386) |
8 |
|
9 |
Revision Changes Path |
10 |
1.24 sys-devel/llvm/llvm-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.24&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.24&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.23&r2=1.24 |
15 |
|
16 |
Index: llvm-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v |
19 |
retrieving revision 1.23 |
20 |
retrieving revision 1.24 |
21 |
diff -u -r1.23 -r1.24 |
22 |
--- llvm-9999.ebuild 13 Apr 2012 14:16:55 -0000 1.23 |
23 |
+++ llvm-9999.ebuild 30 Apr 2012 15:09:25 -0000 1.24 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2012 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.23 2012/04/13 14:16:55 voyageur Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.24 2012/04/30 15:09:25 grobian Exp $ |
29 |
|
30 |
EAPI="4" |
31 |
PYTHON_DEPEND="2" |
32 |
@@ -152,9 +152,11 @@ |
33 |
|
34 |
# Fix install_names on Darwin. The build system is too complicated |
35 |
# to just fix this, so we correct it post-install |
36 |
- local lib= f= odylib= |
37 |
+ local lib= f= odylib= libpv=${PV} |
38 |
if [[ ${CHOST} == *-darwin* ]] ; then |
39 |
- for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.dylib ; do |
40 |
+ eval $(grep PACKAGE_VERSION= configure) |
41 |
+ [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} |
42 |
+ for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.dylib ; do |
43 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
44 |
[[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue |
45 |
ebegin "fixing install_name of $lib" |
46 |
@@ -164,11 +166,11 @@ |
47 |
eend $? |
48 |
done |
49 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do |
50 |
- odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib) |
51 |
+ odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib) |
52 |
ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
53 |
install_name_tool \ |
54 |
-change "${odylib}" \ |
55 |
- "${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ |
56 |
+ "${EPREFIX}"/usr/lib/${PN}/libLLVM-${libpv}.dylib \ |
57 |
"${f}" |
58 |
eend $? |
59 |
done |
60 |
|
61 |
|
62 |
|
63 |
1.68 sys-devel/llvm/ChangeLog |
64 |
|
65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.68&view=markup |
66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.68&content-type=text/plain |
67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.67&r2=1.68 |
68 |
|
69 |
Index: ChangeLog |
70 |
=================================================================== |
71 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v |
72 |
retrieving revision 1.67 |
73 |
retrieving revision 1.68 |
74 |
diff -u -r1.67 -r1.68 |
75 |
--- ChangeLog 13 Apr 2012 14:16:55 -0000 1.67 |
76 |
+++ ChangeLog 30 Apr 2012 15:09:25 -0000 1.68 |
77 |
@@ -1,6 +1,10 @@ |
78 |
# ChangeLog for sys-devel/llvm |
79 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
80 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.67 2012/04/13 14:16:55 voyageur Exp $ |
81 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.68 2012/04/30 15:09:25 grobian Exp $ |
82 |
+ |
83 |
+ 30 Apr 2012; Fabian Groffen <grobian@g.o> llvm-9999.ebuild: |
84 |
+ Extract the version LLVM refers to internally so we can properly fix |
85 |
+ install_names on Darwin, bug #412137 |
86 |
|
87 |
13 Apr 2012; Bernard Cafarelli <voyageur@g.o> -llvm-3.0-r1.ebuild, |
88 |
llvm-3.0-r2.ebuild, llvm-9999.ebuild: |