grobian 15/01/31 16:42:19
Modified: llvm-3.5.0.ebuild llvm-3.5.1.ebuild
llvm-3.4.2.ebuild llvm-9999.ebuild ChangeLog
Log:
Update install_name patching, by Michael Weiser, bug #536716
(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with
key 0x5F75F607C5C74E89)
Revision Changes Path
1.12 sys-devel/llvm/llvm-3.5.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?r1=1.11&r2=1.12
Index: llvm-3.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- llvm-3.5.0.ebuild 1 Jan 2015 20:53:32 -0000 1.11
+++ llvm-3.5.0.ebuild 31 Jan 2015 16:42:19 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.11
2015/01/01 20:53:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.12
2015/01/31 16:42:19 grobian Exp $
EAPI=5
@@ -438,7 +438,8 @@
if [[ ${CHOST} == *-darwin* ]] ; then
eval $(grep PACKAGE_VERSION= configure)
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
- 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
+ libpvminor=${libpv%.[0-9]*}
+ 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
# libEnhancedDisassembly is Darwin10 only, so non-fatal
# + omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -451,7 +452,7 @@
done
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib
"${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
# omit clang libs if not enabled
- [[ -f ${ED}/usr/lib/${lib} ]] || continue
+ [[ -f "${f}" ]] || continue
scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
while read odylib ; do
@@ -463,6 +464,9 @@
*/libLLVM-${libpv}.dylib)
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
;;
+ */libLLVM-${libpvminor}.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+ ;;
*/libLTO.dylib)
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
;;
1.4 sys-devel/llvm/llvm-3.5.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild?r1=1.3&r2=1.4
Index: llvm-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- llvm-3.5.1.ebuild 23 Jan 2015 13:22:11 -0000 1.3
+++ llvm-3.5.1.ebuild 31 Jan 2015 16:42:19 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.3
2015/01/23 13:22:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.4
2015/01/31 16:42:19 grobian Exp $
EAPI=5
@@ -438,7 +438,8 @@
if [[ ${CHOST} == *-darwin* ]] ; then
eval $(grep PACKAGE_VERSION= configure)
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
- 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
+ libpvminor=${libpv%.[0-9]*}
+ 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
# libEnhancedDisassembly is Darwin10 only, so non-fatal
# + omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -451,7 +452,7 @@
done
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib
"${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
# omit clang libs if not enabled
- [[ -f ${ED}/usr/lib/${lib} ]] || continue
+ [[ -f "${f}" ]] || continue
scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
while read odylib ; do
@@ -463,6 +464,9 @@
*/libLLVM-${libpv}.dylib)
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
;;
+ */libLLVM-${libpvminor}.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+ ;;
*/libLTO.dylib)
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
;;
1.7 sys-devel/llvm/llvm-3.4.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?r1=1.6&r2=1.7
Index: llvm-3.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- llvm-3.4.2.ebuild 11 Jan 2015 20:05:43 -0000 1.6
+++ llvm-3.4.2.ebuild 31 Jan 2015 16:42:19 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.6
2015/01/11 20:05:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.7
2015/01/31 16:42:19 grobian Exp $
EAPI=5
@@ -452,7 +452,8 @@
if [[ ${CHOST} == *-darwin* ]] ; then
eval $(grep PACKAGE_VERSION= configure)
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
- 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
+ libpvminor=${libpv%.[0-9]*}
+ 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
# libEnhancedDisassembly is Darwin10 only, so non-fatal
# + omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -465,7 +466,7 @@
done
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib
"${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
# omit clang libs if not enabled
- [[ -f ${ED}/usr/lib/${lib} ]] || continue
+ [[ -f "${f}" ]] || continue
scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
while read odylib ; do
@@ -477,6 +478,9 @@
*/libLLVM-${libpv}.dylib)
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
;;
+ */libLLVM-${libpvminor}.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+ ;;
*/libLTO.dylib)
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
;;
1.99 sys-devel/llvm/llvm-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.99&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.99&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.98&r2=1.99
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- llvm-9999.ebuild 25 Jan 2015 23:45:06 -0000 1.98
+++ llvm-9999.ebuild 31 Jan 2015 16:42:19 -0000 1.99
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.98
2015/01/25 23:45:06 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.99
2015/01/31 16:42:19 grobian Exp $
EAPI=5
@@ -415,11 +415,12 @@
# Fix install_names on Darwin. The build system is too complicated
# to just fix this, so we correct it post-install
- local lib= f= odylib= libpv=${PV}
+ local lib= f= odylib= ndylib= libpv=${PV}
if [[ ${CHOST} == *-darwin* ]] ; then
eval $(grep PACKAGE_VERSION= configure)
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
- for lib in
lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib
LLVMHello.dylib ; do
+ libpvminor=${libpv%.[0-9]*}
+ 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
# libEnhancedDisassembly is Darwin10 only, so non-fatal
# + omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -430,21 +431,35 @@
"${ED}"/usr/lib/${lib}
eend $?
done
- for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib
; do
+ for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib
"${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
# omit clang libs if not enabled
- [[ -f ${ED}/usr/lib/${lib} ]] || continue
+ [[ -f "${f}" ]] || continue
- odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' |
grep libLLVM-${libpv}.dylib)
- ebegin "fixing install_name reference to ${odylib} of
${f##*/}"
- install_name_tool \
- -change "${odylib}" \
-
"${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
- -change "@rpath/libclang.dylib" \
- "${EPREFIX}"/usr/lib/libclang.dylib \
- -change "${S}"/Release/lib/libclang.dylib \
- "${EPREFIX}"/usr/lib/libclang.dylib \
- "${f}"
- eend $?
+ scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+ while read odylib ; do
+ ndylib=
+ case ${odylib} in
+ */libclang.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+ ;;
+ */libLLVM-${libpv}.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+ ;;
+ */libLLVM-${libpvminor}.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+ ;;
+ */libLTO.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+ ;;
+ esac
+ if [[ -n ${ndylib} ]] ; then
+ ebegin "fixing install_name reference
to ${odylib} of ${f##*/}"
+ install_name_tool \
+ -change "${odylib}" "${ndylib}"
\
+ "${f}"
+ eend $?
+ fi
+ done
done
fi
}
1.223 sys-devel/llvm/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.223&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.223&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.222&r2=1.223
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- ChangeLog 25 Jan 2015 23:45:06 -0000 1.222
+++ ChangeLog 31 Jan 2015 16:42:19 -0000 1.223
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.222 2015/01/25
23:45:06 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.223 2015/01/31
16:42:19 grobian Exp $
+
+ 31 Jan 2015; Fabian Groffen <[email protected]> llvm-3.4.2.ebuild,
+ llvm-3.5.0.ebuild, llvm-3.5.1.ebuild, llvm-9999.ebuild:
+ Update install_name patching, by Michael Weiser, bug #536716
25 Jan 2015; Bernard Cafarelli <[email protected]> llvm-9999.ebuild:
Update ocaml tests path for live ebuild, bug #537504
