| 1 |
mgorny 13/12/28 14:02:19 |
| 2 |
|
| 3 |
Modified: llvm-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add bugpoint to built tools. Switch llvm-config wrapping to use $CHOST-llvm-config. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.73 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.73&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.73&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.72&r2=1.73 |
| 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.72 |
| 20 |
retrieving revision 1.73 |
| 21 |
diff -u -r1.72 -r1.73 |
| 22 |
--- llvm-9999.ebuild 27 Dec 2013 14:43:50 -0000 1.72 |
| 23 |
+++ llvm-9999.ebuild 28 Dec 2013 14:02:19 -0000 1.73 |
| 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.72 2013/12/27 14:43:50 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.73 2013/12/28 14:02:19 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -277,7 +277,7 @@ |
| 33 |
llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump |
| 34 |
llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov |
| 35 |
llvm-size llvm-stress llvm-mcmarkup llvm-symbolizer obj2yaml |
| 36 |
- yaml2obj lto |
| 37 |
+ yaml2obj lto bugpoint |
| 38 |
) |
| 39 |
|
| 40 |
# those tools require 'lto' built first, so we need to delay |
| 41 |
@@ -357,11 +357,22 @@ |
| 42 |
|
| 43 |
emake "${MAKEARGS[@]}" DESTDIR="${D}" install |
| 44 |
|
| 45 |
- if multilib_build_binaries; then |
| 46 |
+ # Preserve ABI-variant of llvm-config. |
| 47 |
+ dodir /tmp |
| 48 |
+ mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/"${CHOST}"-llvm-config || die |
| 49 |
+ |
| 50 |
+ if ! multilib_build_binaries; then |
| 51 |
+ # Drop all the executables since LLVM doesn't like to |
| 52 |
+ # clobber when installing. |
| 53 |
+ rm -r "${ED}"/usr/bin || die |
| 54 |
+ |
| 55 |
+ # Backwards compat, will be happily removed someday. |
| 56 |
+ dosym "${CHOST}"-llvm-config /tmp/llvm-config.${ABI} |
| 57 |
+ else |
| 58 |
# Move files back. |
| 59 |
- if path_exists -o "${ED}"/tmp/llvm-config.*; then |
| 60 |
- mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die |
| 61 |
- fi |
| 62 |
+ mv "${ED}"/tmp/*llvm-config* "${ED}"/usr/bin || die |
| 63 |
+ # Create a symlink for host's llvm-config. |
| 64 |
+ dosym "${CHOST}"-llvm-config /usr/bin/llvm-config |
| 65 |
|
| 66 |
# Install docs. |
| 67 |
doman "${S}"/docs/_build/man/*.1 |
| 68 |
@@ -377,13 +388,6 @@ |
| 69 |
|
| 70 |
# install cmake modules |
| 71 |
emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install |
| 72 |
- else |
| 73 |
- # Preserve ABI-variant of llvm-config, |
| 74 |
- # then drop all the executables since LLVM doesn't like to |
| 75 |
- # clobber when installing. |
| 76 |
- mkdir -p "${ED}"/tmp || die |
| 77 |
- mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/llvm-config.${ABI} || die |
| 78 |
- rm -r "${ED}"/usr/bin || die |
| 79 |
fi |
| 80 |
|
| 81 |
# Fix install_names on Darwin. The build system is too complicated |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.159 sys-devel/llvm/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.159&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.159&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.158&r2=1.159 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v |
| 94 |
retrieving revision 1.158 |
| 95 |
retrieving revision 1.159 |
| 96 |
diff -u -r1.158 -r1.159 |
| 97 |
--- ChangeLog 27 Dec 2013 14:43:50 -0000 1.158 |
| 98 |
+++ ChangeLog 28 Dec 2013 14:02:19 -0000 1.159 |
| 99 |
@@ -1,6 +1,10 @@ |
| 100 |
# ChangeLog for sys-devel/llvm |
| 101 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.158 2013/12/27 14:43:50 mgorny Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.159 2013/12/28 14:02:19 mgorny Exp $ |
| 104 |
+ |
| 105 |
+ 28 Dec 2013; Michał Górny <mgorny@g.o> llvm-9999.ebuild: |
| 106 |
+ Add bugpoint to built tools. Switch llvm-config wrapping to use $CHOST-llvm- |
| 107 |
+ config. |
| 108 |
|
| 109 |
27 Dec 2013; Michał Górny <mgorny@g.o> llvm-9999.ebuild: |
| 110 |
Update/fix dependencies. |
Archives