| 1 |
grobian 11/11/24 08:56:51 |
| 2 |
|
| 3 |
Modified: llvm-9999.ebuild llvm-2.8-r2.ebuild |
| 4 |
llvm-2.9-r2.ebuild llvm-3.0_rc3.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Fix install_name pointer to libLLVM-x.y.dylib in a more flexible way to avoid bugs like #391763 |
| 7 |
|
| 8 |
(Portage version: 2.2.01.19572-prefix/cvs/SunOS i386) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.17 sys-devel/llvm/llvm-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.17&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.17&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.16&r2=1.17 |
| 16 |
|
| 17 |
Index: llvm-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v |
| 20 |
retrieving revision 1.16 |
| 21 |
retrieving revision 1.17 |
| 22 |
diff -u -r1.16 -r1.17 |
| 23 |
--- llvm-9999.ebuild 9 Nov 2011 15:11:05 -0000 1.16 |
| 24 |
+++ llvm-9999.ebuild 24 Nov 2011 08:56:51 -0000 1.17 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.16 2011/11/09 15:11:05 voyageur Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.17 2011/11/24 08:56:51 grobian Exp $ |
| 30 |
|
| 31 |
EAPI="3" |
| 32 |
inherit subversion eutils flag-o-matic multilib toolchain-funcs |
| 33 |
@@ -132,6 +132,7 @@ |
| 34 |
|
| 35 |
# Fix install_names on Darwin. The build system is too complicated |
| 36 |
# to just fix this, so we correct it post-install |
| 37 |
+ local lib= f= odylib= |
| 38 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 39 |
for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do |
| 40 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 41 |
@@ -143,9 +144,10 @@ |
| 42 |
eend $? |
| 43 |
done |
| 44 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do |
| 45 |
- ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}" |
| 46 |
+ odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib) |
| 47 |
+ ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
| 48 |
install_name_tool \ |
| 49 |
- -change "@executable_path/../lib/libLLVM-${PV}.dylib" \ |
| 50 |
+ -change "${odylib}" \ |
| 51 |
"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ |
| 52 |
"${f}" |
| 53 |
eend $? |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.8 sys-devel/llvm/llvm-2.8-r2.ebuild |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild?rev=1.8&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild?rev=1.8&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild?r1=1.7&r2=1.8 |
| 62 |
|
| 63 |
Index: llvm-2.8-r2.ebuild |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v |
| 66 |
retrieving revision 1.7 |
| 67 |
retrieving revision 1.8 |
| 68 |
diff -u -r1.7 -r1.8 |
| 69 |
--- llvm-2.8-r2.ebuild 4 Oct 2011 11:43:37 -0000 1.7 |
| 70 |
+++ llvm-2.8-r2.ebuild 24 Nov 2011 08:56:51 -0000 1.8 |
| 71 |
@@ -1,6 +1,6 @@ |
| 72 |
# Copyright 1999-2011 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.7 2011/10/04 11:43:37 voyageur Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.8 2011/11/24 08:56:51 grobian Exp $ |
| 76 |
|
| 77 |
EAPI="3" |
| 78 |
inherit eutils multilib toolchain-funcs |
| 79 |
@@ -160,6 +160,7 @@ |
| 80 |
|
| 81 |
# Fix install_names on Darwin. The build system is too complicated |
| 82 |
# to just fix this, so we correct it post-install |
| 83 |
+ local lib= f= odylib= |
| 84 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 85 |
for lib in lib{EnhancedDisassembly,LLVM-${PV},BugpointPasses,LLVMHello,LTO,profile_rt}.dylib ; do |
| 86 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 87 |
@@ -171,9 +172,10 @@ |
| 88 |
eend $? |
| 89 |
done |
| 90 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do |
| 91 |
- ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}" |
| 92 |
+ odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib) |
| 93 |
+ ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
| 94 |
install_name_tool \ |
| 95 |
- -change "${S}"/Release/lib/libLLVM-${PV}.dylib \ |
| 96 |
+ -change "${odylib}" \ |
| 97 |
"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ |
| 98 |
"${f}" |
| 99 |
eend $? |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
1.5 sys-devel/llvm/llvm-2.9-r2.ebuild |
| 104 |
|
| 105 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild?rev=1.5&view=markup |
| 106 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild?rev=1.5&content-type=text/plain |
| 107 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild?r1=1.4&r2=1.5 |
| 108 |
|
| 109 |
Index: llvm-2.9-r2.ebuild |
| 110 |
=================================================================== |
| 111 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v |
| 112 |
retrieving revision 1.4 |
| 113 |
retrieving revision 1.5 |
| 114 |
diff -u -r1.4 -r1.5 |
| 115 |
--- llvm-2.9-r2.ebuild 17 Nov 2011 18:50:50 -0000 1.4 |
| 116 |
+++ llvm-2.9-r2.ebuild 24 Nov 2011 08:56:51 -0000 1.5 |
| 117 |
@@ -1,6 +1,6 @@ |
| 118 |
# Copyright 1999-2011 Gentoo Foundation |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.4 2011/11/17 18:50:50 phajdan.jr Exp $ |
| 121 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.5 2011/11/24 08:56:51 grobian Exp $ |
| 122 |
|
| 123 |
EAPI="3" |
| 124 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 125 |
@@ -162,6 +162,7 @@ |
| 126 |
|
| 127 |
# Fix install_names on Darwin. The build system is too complicated |
| 128 |
# to just fix this, so we correct it post-install |
| 129 |
+ local lib= f= odylib= |
| 130 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 131 |
for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do |
| 132 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 133 |
@@ -173,9 +174,10 @@ |
| 134 |
eend $? |
| 135 |
done |
| 136 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do |
| 137 |
- ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}" |
| 138 |
+ odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib) |
| 139 |
+ ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
| 140 |
install_name_tool \ |
| 141 |
- -change "@executable_path/../lib/libLLVM-${PV}.dylib" \ |
| 142 |
+ -change "${odylib}" \ |
| 143 |
"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ |
| 144 |
"${f}" |
| 145 |
eend $? |
| 146 |
|
| 147 |
|
| 148 |
|
| 149 |
1.3 sys-devel/llvm/llvm-3.0_rc3.ebuild |
| 150 |
|
| 151 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild?rev=1.3&view=markup |
| 152 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild?rev=1.3&content-type=text/plain |
| 153 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild?r1=1.2&r2=1.3 |
| 154 |
|
| 155 |
Index: llvm-3.0_rc3.ebuild |
| 156 |
=================================================================== |
| 157 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild,v |
| 158 |
retrieving revision 1.2 |
| 159 |
retrieving revision 1.3 |
| 160 |
diff -u -r1.2 -r1.3 |
| 161 |
--- llvm-3.0_rc3.ebuild 22 Nov 2011 13:42:23 -0000 1.2 |
| 162 |
+++ llvm-3.0_rc3.ebuild 24 Nov 2011 08:56:51 -0000 1.3 |
| 163 |
@@ -1,6 +1,6 @@ |
| 164 |
# Copyright 1999-2011 Gentoo Foundation |
| 165 |
# Distributed under the terms of the GNU General Public License v2 |
| 166 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild,v 1.2 2011/11/22 13:42:23 voyageur Exp $ |
| 167 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild,v 1.3 2011/11/24 08:56:51 grobian Exp $ |
| 168 |
|
| 169 |
EAPI="3" |
| 170 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 171 |
@@ -141,6 +141,7 @@ |
| 172 |
|
| 173 |
# Fix install_names on Darwin. The build system is too complicated |
| 174 |
# to just fix this, so we correct it post-install |
| 175 |
+ local lib= f= odylib= |
| 176 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 177 |
for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do |
| 178 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 179 |
@@ -152,9 +153,10 @@ |
| 180 |
eend $? |
| 181 |
done |
| 182 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do |
| 183 |
- ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}" |
| 184 |
+ odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib) |
| 185 |
+ ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
| 186 |
install_name_tool \ |
| 187 |
- -change "@executable_path/../lib/libLLVM-${PV}.dylib" \ |
| 188 |
+ -change "${odylib}" \ |
| 189 |
"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ |
| 190 |
"${f}" |
| 191 |
eend $? |
| 192 |
|
| 193 |
|
| 194 |
|
| 195 |
1.52 sys-devel/llvm/ChangeLog |
| 196 |
|
| 197 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.52&view=markup |
| 198 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.52&content-type=text/plain |
| 199 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.51&r2=1.52 |
| 200 |
|
| 201 |
Index: ChangeLog |
| 202 |
=================================================================== |
| 203 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v |
| 204 |
retrieving revision 1.51 |
| 205 |
retrieving revision 1.52 |
| 206 |
diff -u -r1.51 -r1.52 |
| 207 |
--- ChangeLog 22 Nov 2011 13:42:23 -0000 1.51 |
| 208 |
+++ ChangeLog 24 Nov 2011 08:56:51 -0000 1.52 |
| 209 |
@@ -1,6 +1,11 @@ |
| 210 |
# ChangeLog for sys-devel/llvm |
| 211 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 212 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.51 2011/11/22 13:42:23 voyageur Exp $ |
| 213 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.52 2011/11/24 08:56:51 grobian Exp $ |
| 214 |
+ |
| 215 |
+ 24 Nov 2011; Fabian Groffen <grobian@g.o> llvm-2.8-r2.ebuild, |
| 216 |
+ llvm-9999.ebuild, llvm-2.9-r2.ebuild, llvm-3.0_rc3.ebuild: |
| 217 |
+ Fix install_name pointer to libLLVM-x.y.dylib in a more flexible way to avoid |
| 218 |
+ bugs like #391763 |
| 219 |
|
| 220 |
22 Nov 2011; Bernard Cafarelli <voyageur@g.o> llvm-3.0_rc3.ebuild, |
| 221 |
metadata.xml: |
Archives