| 1 |
commit: ff80562c7707b0a4d836c0b8b498dfc48cdedb9a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 18:07:56 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 15 12:47:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff80562c |
| 7 |
|
| 8 |
sys-devel/lld: Support building against slotted LLVM |
| 9 |
|
| 10 |
sys-devel/lld/lld-4.0.0_rc1.ebuild | 4 ++-- |
| 11 |
sys-devel/lld/lld-9999.ebuild | 4 ++-- |
| 12 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-devel/lld/lld-4.0.0_rc1.ebuild b/sys-devel/lld/lld-4.0.0_rc1.ebuild |
| 15 |
index cb624392d7..f927da85e4 100644 |
| 16 |
--- a/sys-devel/lld/lld-4.0.0_rc1.ebuild |
| 17 |
+++ b/sys-devel/lld/lld-4.0.0_rc1.ebuild |
| 18 |
@@ -9,7 +9,7 @@ EAPI=6 |
| 19 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 20 |
PYTHON_COMPAT=( python2_7 ) |
| 21 |
|
| 22 |
-inherit cmake-utils python-any-r1 |
| 23 |
+inherit cmake-utils llvm python-any-r1 |
| 24 |
|
| 25 |
DESCRIPTION="The LLVM linker (link editor)" |
| 26 |
HOMEPAGE="http://llvm.org/" |
| 27 |
@@ -38,6 +38,7 @@ python_check_deps() { |
| 28 |
} |
| 29 |
|
| 30 |
pkg_setup() { |
| 31 |
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup |
| 32 |
use test && python-any-r1_pkg_setup |
| 33 |
} |
| 34 |
|
| 35 |
@@ -50,7 +51,6 @@ src_unpack() { |
| 36 |
} |
| 37 |
|
| 38 |
src_configure() { |
| 39 |
- local libdir=$(get_libdir) |
| 40 |
local mycmakeargs=( |
| 41 |
# TODO: fix rpaths |
| 42 |
#-DBUILD_SHARED_LIBS=ON |
| 43 |
|
| 44 |
diff --git a/sys-devel/lld/lld-9999.ebuild b/sys-devel/lld/lld-9999.ebuild |
| 45 |
index b4f23d3031..b6ef4ad043 100644 |
| 46 |
--- a/sys-devel/lld/lld-9999.ebuild |
| 47 |
+++ b/sys-devel/lld/lld-9999.ebuild |
| 48 |
@@ -9,7 +9,7 @@ EAPI=6 |
| 49 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 50 |
PYTHON_COMPAT=( python2_7 ) |
| 51 |
|
| 52 |
-inherit cmake-utils git-r3 python-any-r1 |
| 53 |
+inherit cmake-utils git-r3 llvm python-any-r1 |
| 54 |
|
| 55 |
DESCRIPTION="The LLVM linker (link editor)" |
| 56 |
HOMEPAGE="http://llvm.org/" |
| 57 |
@@ -34,6 +34,7 @@ python_check_deps() { |
| 58 |
} |
| 59 |
|
| 60 |
pkg_setup() { |
| 61 |
+ llvm_pkg_setup |
| 62 |
use test && python-any-r1_pkg_setup |
| 63 |
} |
| 64 |
|
| 65 |
@@ -53,7 +54,6 @@ src_unpack() { |
| 66 |
} |
| 67 |
|
| 68 |
src_configure() { |
| 69 |
- local libdir=$(get_libdir) |
| 70 |
local mycmakeargs=( |
| 71 |
-DBUILD_SHARED_LIBS=ON |
Archives