| 1 |
mgorny 13/11/30 10:33:59 |
| 2 |
|
| 3 |
Modified: llvm-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Drop the custom Gentoo "llvm" sub-dir that requires a lot of extra hacking, and causes bugs like #492554 and #488216. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.61 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.61&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.61&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.60&r2=1.61 |
| 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.60 |
| 20 |
retrieving revision 1.61 |
| 21 |
diff -u -r1.60 -r1.61 |
| 22 |
--- llvm-9999.ebuild 27 Nov 2013 05:32:16 -0000 1.60 |
| 23 |
+++ llvm-9999.ebuild 30 Nov 2013 10:33:59 -0000 1.61 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 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.60 2013/11/27 05:32:16 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.61 2013/11/30 10:33:59 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -151,7 +151,7 @@ |
| 33 |
src_prepare() { |
| 34 |
epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch |
| 35 |
epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch |
| 36 |
- use clang && epatch "${FILESDIR}"/clang-3.3-gentoo-install.patch |
| 37 |
+ use clang && epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch |
| 38 |
|
| 39 |
local sub_files=( |
| 40 |
Makefile.config.in |
| 41 |
@@ -276,12 +276,6 @@ |
| 42 |
multilib_src_install() { |
| 43 |
emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install |
| 44 |
|
| 45 |
- # Fix rpaths. |
| 46 |
- if use !kernel_Darwin ; then |
| 47 |
- chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \ |
| 48 |
- "${ED}"/usr/bin/* || die |
| 49 |
- fi |
| 50 |
- |
| 51 |
if multilib_build_binaries; then |
| 52 |
# Move files back. |
| 53 |
if path_exists -o "${ED}"/tmp/llvm-config.*; then |
| 54 |
@@ -305,27 +299,27 @@ |
| 55 |
for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib {BugpointPasses,LLVMHello}.dylib ; do |
| 56 |
# libEnhancedDisassembly is Darwin10 only, so non-fatal |
| 57 |
# + omit clang libs if not enabled |
| 58 |
- [[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue |
| 59 |
+ [[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 60 |
|
| 61 |
ebegin "fixing install_name of $lib" |
| 62 |
install_name_tool \ |
| 63 |
- -id "${EPREFIX}"/usr/lib/${PN}/${lib} \ |
| 64 |
- "${ED}"/usr/lib/${PN}/${lib} |
| 65 |
+ -id "${EPREFIX}"/usr/lib/${lib} \ |
| 66 |
+ "${ED}"/usr/lib/${lib} |
| 67 |
eend $? |
| 68 |
done |
| 69 |
- for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/lib{LTO,clang}.dylib ; do |
| 70 |
+ for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib ; do |
| 71 |
# omit clang libs if not enabled |
| 72 |
- [[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue |
| 73 |
+ [[ -f ${ED}/usr/lib/${lib} ]] || continue |
| 74 |
|
| 75 |
odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib) |
| 76 |
ebegin "fixing install_name reference to ${odylib} of ${f##*/}" |
| 77 |
install_name_tool \ |
| 78 |
-change "${odylib}" \ |
| 79 |
- "${EPREFIX}"/usr/lib/${PN}/libLLVM-${libpv}.dylib \ |
| 80 |
+ "${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \ |
| 81 |
-change "@rpath/libclang.dylib" \ |
| 82 |
- "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ |
| 83 |
+ "${EPREFIX}"/usr/lib/libclang.dylib \ |
| 84 |
-change "${S}"/Release/lib/libclang.dylib \ |
| 85 |
- "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ |
| 86 |
+ "${EPREFIX}"/usr/lib/libclang.dylib \ |
| 87 |
"${f}" |
| 88 |
eend $? |
| 89 |
done |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.147 sys-devel/llvm/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.147&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.147&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.146&r2=1.147 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v |
| 102 |
retrieving revision 1.146 |
| 103 |
retrieving revision 1.147 |
| 104 |
diff -u -r1.146 -r1.147 |
| 105 |
--- ChangeLog 27 Nov 2013 05:32:16 -0000 1.146 |
| 106 |
+++ ChangeLog 30 Nov 2013 10:33:59 -0000 1.147 |
| 107 |
@@ -1,6 +1,12 @@ |
| 108 |
# ChangeLog for sys-devel/llvm |
| 109 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.146 2013/11/27 05:32:16 mgorny Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.147 2013/11/30 10:33:59 mgorny Exp $ |
| 112 |
+ |
| 113 |
+ 30 Nov 2013; Michał Górny <mgorny@g.o> |
| 114 |
+ +files/clang-3.4-gentoo-install.patch, files/llvm-3.4-gentoo-install.patch, |
| 115 |
+ llvm-9999.ebuild: |
| 116 |
+ Drop the custom Gentoo "llvm" sub-dir that requires a lot of extra hacking, |
| 117 |
+ and causes bugs like #492554 and #488216. |
| 118 |
|
| 119 |
27 Nov 2013; Michał Górny <mgorny@g.o> llvm-9999.ebuild: |
| 120 |
Bump clang version to 3.5, bug #491880. Thanks to Mike Lothian for finding out |
Archives