| 1 |
grobian 15/01/31 16:42:19 |
| 2 |
|
| 3 |
Modified: llvm-3.5.0.ebuild llvm-3.5.1.ebuild |
| 4 |
llvm-3.4.2.ebuild llvm-9999.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Update install_name patching, by Michael Weiser, bug #536716 |
| 7 |
|
| 8 |
(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.12 sys-devel/llvm/llvm-3.5.0.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.12&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.12&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?r1=1.11&r2=1.12 |
| 16 |
|
| 17 |
Index: llvm-3.5.0.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v |
| 20 |
retrieving revision 1.11 |
| 21 |
retrieving revision 1.12 |
| 22 |
diff -u -r1.11 -r1.12 |
| 23 |
--- llvm-3.5.0.ebuild 1 Jan 2015 20:53:32 -0000 1.11 |
| 24 |
+++ llvm-3.5.0.ebuild 31 Jan 2015 16:42:19 -0000 1.12 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.11 2015/01/01 20:53:32 maekke Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.12 2015/01/31 16:42:19 grobian Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -438,7 +438,8 @@ |
| 34 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 35 |
eval $(grep PACKAGE_VERSION= configure) |
| 36 |
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} |
| 37 |
- for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do |
| 38 |
+ libpvminor=${libpv%.[0-9]*} |
| 39 |
+ for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do |
| 40 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 41 |
# + omit clang libs if not enabled |
| 42 |
[[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 43 |
@@ -451,7 +452,7 @@ |
| 44 |
done |
| 45 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do |
| 46 |
# omit clang libs if not enabled |
| 47 |
- [[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 48 |
+ [[ -f "${f}" ]] || continue |
| 49 |
|
| 50 |
scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \ |
| 51 |
while read odylib ; do |
| 52 |
@@ -463,6 +464,9 @@ |
| 53 |
*/libLLVM-${libpv}.dylib) |
| 54 |
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib |
| 55 |
;; |
| 56 |
+ */libLLVM-${libpvminor}.dylib) |
| 57 |
+ ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib |
| 58 |
+ ;; |
| 59 |
*/libLTO.dylib) |
| 60 |
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib |
| 61 |
;; |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.4 sys-devel/llvm/llvm-3.5.1.ebuild |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild?rev=1.4&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild?rev=1.4&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild?r1=1.3&r2=1.4 |
| 70 |
|
| 71 |
Index: llvm-3.5.1.ebuild |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v |
| 74 |
retrieving revision 1.3 |
| 75 |
retrieving revision 1.4 |
| 76 |
diff -u -r1.3 -r1.4 |
| 77 |
--- llvm-3.5.1.ebuild 23 Jan 2015 13:22:11 -0000 1.3 |
| 78 |
+++ llvm-3.5.1.ebuild 31 Jan 2015 16:42:19 -0000 1.4 |
| 79 |
@@ -1,6 +1,6 @@ |
| 80 |
# Copyright 1999-2015 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.3 2015/01/23 13:22:11 voyageur Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.4 2015/01/31 16:42:19 grobian Exp $ |
| 84 |
|
| 85 |
EAPI=5 |
| 86 |
|
| 87 |
@@ -438,7 +438,8 @@ |
| 88 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 89 |
eval $(grep PACKAGE_VERSION= configure) |
| 90 |
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} |
| 91 |
- for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do |
| 92 |
+ libpvminor=${libpv%.[0-9]*} |
| 93 |
+ for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do |
| 94 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 95 |
# + omit clang libs if not enabled |
| 96 |
[[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 97 |
@@ -451,7 +452,7 @@ |
| 98 |
done |
| 99 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do |
| 100 |
# omit clang libs if not enabled |
| 101 |
- [[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 102 |
+ [[ -f "${f}" ]] || continue |
| 103 |
|
| 104 |
scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \ |
| 105 |
while read odylib ; do |
| 106 |
@@ -463,6 +464,9 @@ |
| 107 |
*/libLLVM-${libpv}.dylib) |
| 108 |
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib |
| 109 |
;; |
| 110 |
+ */libLLVM-${libpvminor}.dylib) |
| 111 |
+ ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib |
| 112 |
+ ;; |
| 113 |
*/libLTO.dylib) |
| 114 |
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib |
| 115 |
;; |
| 116 |
|
| 117 |
|
| 118 |
|
| 119 |
1.7 sys-devel/llvm/llvm-3.4.2.ebuild |
| 120 |
|
| 121 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?rev=1.7&view=markup |
| 122 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?rev=1.7&content-type=text/plain |
| 123 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?r1=1.6&r2=1.7 |
| 124 |
|
| 125 |
Index: llvm-3.4.2.ebuild |
| 126 |
=================================================================== |
| 127 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v |
| 128 |
retrieving revision 1.6 |
| 129 |
retrieving revision 1.7 |
| 130 |
diff -u -r1.6 -r1.7 |
| 131 |
--- llvm-3.4.2.ebuild 11 Jan 2015 20:05:43 -0000 1.6 |
| 132 |
+++ llvm-3.4.2.ebuild 31 Jan 2015 16:42:19 -0000 1.7 |
| 133 |
@@ -1,6 +1,6 @@ |
| 134 |
# Copyright 1999-2015 Gentoo Foundation |
| 135 |
# Distributed under the terms of the GNU General Public License v2 |
| 136 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.6 2015/01/11 20:05:43 grobian Exp $ |
| 137 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.7 2015/01/31 16:42:19 grobian Exp $ |
| 138 |
|
| 139 |
EAPI=5 |
| 140 |
|
| 141 |
@@ -452,7 +452,8 @@ |
| 142 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 143 |
eval $(grep PACKAGE_VERSION= configure) |
| 144 |
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} |
| 145 |
- for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do |
| 146 |
+ libpvminor=${libpv%.[0-9]*} |
| 147 |
+ for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do |
| 148 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 149 |
# + omit clang libs if not enabled |
| 150 |
[[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 151 |
@@ -465,7 +466,7 @@ |
| 152 |
done |
| 153 |
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do |
| 154 |
# omit clang libs if not enabled |
| 155 |
- [[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 156 |
+ [[ -f "${f}" ]] || continue |
| 157 |
|
| 158 |
scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \ |
| 159 |
while read odylib ; do |
| 160 |
@@ -477,6 +478,9 @@ |
| 161 |
*/libLLVM-${libpv}.dylib) |
| 162 |
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib |
| 163 |
;; |
| 164 |
+ */libLLVM-${libpvminor}.dylib) |
| 165 |
+ ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib |
| 166 |
+ ;; |
| 167 |
*/libLTO.dylib) |
| 168 |
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib |
| 169 |
;; |
| 170 |
|
| 171 |
|
| 172 |
|
| 173 |
1.99 sys-devel/llvm/llvm-9999.ebuild |
| 174 |
|
| 175 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.99&view=markup |
| 176 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.99&content-type=text/plain |
| 177 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.98&r2=1.99 |
| 178 |
|
| 179 |
Index: llvm-9999.ebuild |
| 180 |
=================================================================== |
| 181 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v |
| 182 |
retrieving revision 1.98 |
| 183 |
retrieving revision 1.99 |
| 184 |
diff -u -r1.98 -r1.99 |
| 185 |
--- llvm-9999.ebuild 25 Jan 2015 23:45:06 -0000 1.98 |
| 186 |
+++ llvm-9999.ebuild 31 Jan 2015 16:42:19 -0000 1.99 |
| 187 |
@@ -1,6 +1,6 @@ |
| 188 |
# Copyright 1999-2015 Gentoo Foundation |
| 189 |
# Distributed under the terms of the GNU General Public License v2 |
| 190 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.98 2015/01/25 23:45:06 voyageur Exp $ |
| 191 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.99 2015/01/31 16:42:19 grobian Exp $ |
| 192 |
|
| 193 |
EAPI=5 |
| 194 |
|
| 195 |
@@ -415,11 +415,12 @@ |
| 196 |
|
| 197 |
# Fix install_names on Darwin. The build system is too complicated |
| 198 |
# to just fix this, so we correct it post-install |
| 199 |
- local lib= f= odylib= libpv=${PV} |
| 200 |
+ local lib= f= odylib= ndylib= libpv=${PV} |
| 201 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 202 |
eval $(grep PACKAGE_VERSION= configure) |
| 203 |
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} |
| 204 |
- for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib ; do |
| 205 |
+ libpvminor=${libpv%.[0-9]*} |
| 206 |
+ for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do |
| 207 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 208 |
# + omit clang libs if not enabled |
| 209 |
[[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 210 |
@@ -430,21 +431,35 @@ |
| 211 |
"${ED}"/usr/lib/${lib} |
| 212 |
eend $? |
| 213 |
done |
| 214 |
- for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib ; do |
| 215 |
+ for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do |
| 216 |
# omit clang libs if not enabled |
| 217 |
- [[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 218 |
+ [[ -f "${f}" ]] || continue |
| 219 |
|
| 220 |
- odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib) |
| 221 |
- ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
| 222 |
- install_name_tool \ |
| 223 |
- -change "${odylib}" \ |
| 224 |
- "${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \ |
| 225 |
- -change "@rpath/libclang.dylib" \ |
| 226 |
- "${EPREFIX}"/usr/lib/libclang.dylib \ |
| 227 |
- -change "${S}"/Release/lib/libclang.dylib \ |
| 228 |
- "${EPREFIX}"/usr/lib/libclang.dylib \ |
| 229 |
- "${f}" |
| 230 |
- eend $? |
| 231 |
+ scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \ |
| 232 |
+ while read odylib ; do |
| 233 |
+ ndylib= |
| 234 |
+ case ${odylib} in |
| 235 |
+ */libclang.dylib) |
| 236 |
+ ndylib="${EPREFIX}"/usr/lib/libclang.dylib |
| 237 |
+ ;; |
| 238 |
+ */libLLVM-${libpv}.dylib) |
| 239 |
+ ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib |
| 240 |
+ ;; |
| 241 |
+ */libLLVM-${libpvminor}.dylib) |
| 242 |
+ ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib |
| 243 |
+ ;; |
| 244 |
+ */libLTO.dylib) |
| 245 |
+ ndylib="${EPREFIX}"/usr/lib/libLTO.dylib |
| 246 |
+ ;; |
| 247 |
+ esac |
| 248 |
+ if [[ -n ${ndylib} ]] ; then |
| 249 |
+ ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
| 250 |
+ install_name_tool \ |
| 251 |
+ -change "${odylib}" "${ndylib}" \ |
| 252 |
+ "${f}" |
| 253 |
+ eend $? |
| 254 |
+ fi |
| 255 |
+ done |
| 256 |
done |
| 257 |
fi |
| 258 |
} |
| 259 |
|
| 260 |
|
| 261 |
|
| 262 |
1.223 sys-devel/llvm/ChangeLog |
| 263 |
|
| 264 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.223&view=markup |
| 265 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.223&content-type=text/plain |
| 266 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.222&r2=1.223 |
| 267 |
|
| 268 |
Index: ChangeLog |
| 269 |
=================================================================== |
| 270 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v |
| 271 |
retrieving revision 1.222 |
| 272 |
retrieving revision 1.223 |
| 273 |
diff -u -r1.222 -r1.223 |
| 274 |
--- ChangeLog 25 Jan 2015 23:45:06 -0000 1.222 |
| 275 |
+++ ChangeLog 31 Jan 2015 16:42:19 -0000 1.223 |
| 276 |
@@ -1,6 +1,10 @@ |
| 277 |
# ChangeLog for sys-devel/llvm |
| 278 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 279 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.222 2015/01/25 23:45:06 voyageur Exp $ |
| 280 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.223 2015/01/31 16:42:19 grobian Exp $ |
| 281 |
+ |
| 282 |
+ 31 Jan 2015; Fabian Groffen <grobian@g.o> llvm-3.4.2.ebuild, |
| 283 |
+ llvm-3.5.0.ebuild, llvm-3.5.1.ebuild, llvm-9999.ebuild: |
| 284 |
+ Update install_name patching, by Michael Weiser, bug #536716 |
| 285 |
|
| 286 |
25 Jan 2015; Bernard Cafarelli <voyageur@g.o> llvm-9999.ebuild: |
| 287 |
Update ocaml tests path for live ebuild, bug #537504 |
Archives