| 1 |
commit: b71fbcbd46a4de00681f63c61c1b35620432c4e3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 1 18:01:57 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 3 11:46:22 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71fbcbd |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Port to llvm.org eclass |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild | 18 ++++++------------ |
| 13 |
sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild | 16 ++++------------ |
| 14 |
sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild | 19 ++++++------------- |
| 15 |
3 files changed, 16 insertions(+), 37 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild |
| 18 |
index 894c6fce635..df108a4e023 100644 |
| 19 |
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild |
| 20 |
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild |
| 21 |
@@ -4,13 +4,13 @@ |
| 22 |
EAPI=7 |
| 23 |
|
| 24 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 25 |
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 |
| 26 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 |
| 27 |
|
| 28 |
DESCRIPTION="Low level support for a standard C++ library" |
| 29 |
HOMEPAGE="https://libcxxabi.llvm.org/" |
| 30 |
-SRC_URI="" |
| 31 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 32 |
-S=${WORKDIR}/${P}/libcxxabi |
| 33 |
+# libcxx is needed uncondtionally for the headers |
| 34 |
+LLVM_COMPONENTS=( libcxx{abi,} ) |
| 35 |
+llvm.org_set_globals |
| 36 |
|
| 37 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 38 |
SLOT="0" |
| 39 |
@@ -44,12 +44,6 @@ pkg_setup() { |
| 40 |
use test && python-any-r1_pkg_setup |
| 41 |
} |
| 42 |
|
| 43 |
-src_unpack() { |
| 44 |
- git-r3_fetch |
| 45 |
- # we always need libcxx for the headers |
| 46 |
- git-r3_checkout '' '' '' libcxx{,abi} |
| 47 |
-} |
| 48 |
- |
| 49 |
multilib_src_configure() { |
| 50 |
local libdir=$(get_libdir) |
| 51 |
local mycmakeargs=( |
| 52 |
@@ -59,7 +53,7 @@ multilib_src_configure() { |
| 53 |
-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 54 |
-DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 55 |
|
| 56 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include |
| 57 |
+ -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 58 |
# upstream is omitting standard search path for this |
| 59 |
# probably because gcc & clang are bundling their own unwind.h |
| 60 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 61 |
@@ -80,7 +74,7 @@ multilib_src_configure() { |
| 62 |
|
| 63 |
build_libcxx() { |
| 64 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 65 |
- local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx |
| 66 |
+ local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 67 |
local BUILD_DIR=${BUILD_DIR}/libcxx |
| 68 |
local mycmakeargs=( |
| 69 |
-DLIBCXX_LIBDIR_SUFFIX= |
| 70 |
|
| 71 |
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild |
| 72 |
index 61d4e760ed0..eb296035779 100644 |
| 73 |
--- a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild |
| 74 |
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild |
| 75 |
@@ -4,16 +4,13 @@ |
| 76 |
EAPI=7 |
| 77 |
|
| 78 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 79 |
-inherit cmake-multilib llvm multiprocessing python-any-r1 |
| 80 |
- |
| 81 |
-MY_P=${P/_/}.src |
| 82 |
-LIBCXX_P=libcxx-${PV/_/}.src |
| 83 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 |
| 84 |
|
| 85 |
DESCRIPTION="Low level support for a standard C++ library" |
| 86 |
HOMEPAGE="https://libcxxabi.llvm.org/" |
| 87 |
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz |
| 88 |
- https://releases.llvm.org/${PV}/${LIBCXX_P}.tar.xz" |
| 89 |
-S=${WORKDIR}/${MY_P} |
| 90 |
+# libcxx is needed uncondtionally for the headers |
| 91 |
+LLVM_COMPONENTS=( libcxx{abi,} ) |
| 92 |
+llvm.org_set_globals |
| 93 |
|
| 94 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 95 |
SLOT="0" |
| 96 |
@@ -47,11 +44,6 @@ pkg_setup() { |
| 97 |
use test && python-any-r1_pkg_setup |
| 98 |
} |
| 99 |
|
| 100 |
-src_unpack() { |
| 101 |
- default |
| 102 |
- mv "${LIBCXX_P}" libcxx || die |
| 103 |
-} |
| 104 |
- |
| 105 |
multilib_src_configure() { |
| 106 |
local libdir=$(get_libdir) |
| 107 |
local mycmakeargs=( |
| 108 |
|
| 109 |
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild |
| 110 |
index 4874faaacc7..df108a4e023 100644 |
| 111 |
--- a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild |
| 112 |
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild |
| 113 |
@@ -4,14 +4,13 @@ |
| 114 |
EAPI=7 |
| 115 |
|
| 116 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 117 |
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 |
| 118 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 |
| 119 |
|
| 120 |
DESCRIPTION="Low level support for a standard C++ library" |
| 121 |
HOMEPAGE="https://libcxxabi.llvm.org/" |
| 122 |
-SRC_URI="" |
| 123 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 124 |
-EGIT_BRANCH="release/9.x" |
| 125 |
-S=${WORKDIR}/${P}/libcxxabi |
| 126 |
+# libcxx is needed uncondtionally for the headers |
| 127 |
+LLVM_COMPONENTS=( libcxx{abi,} ) |
| 128 |
+llvm.org_set_globals |
| 129 |
|
| 130 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 131 |
SLOT="0" |
| 132 |
@@ -45,12 +44,6 @@ pkg_setup() { |
| 133 |
use test && python-any-r1_pkg_setup |
| 134 |
} |
| 135 |
|
| 136 |
-src_unpack() { |
| 137 |
- git-r3_fetch |
| 138 |
- # we always need libcxx for the headers |
| 139 |
- git-r3_checkout '' '' '' libcxx{,abi} |
| 140 |
-} |
| 141 |
- |
| 142 |
multilib_src_configure() { |
| 143 |
local libdir=$(get_libdir) |
| 144 |
local mycmakeargs=( |
| 145 |
@@ -60,7 +53,7 @@ multilib_src_configure() { |
| 146 |
-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 147 |
-DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 148 |
|
| 149 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include |
| 150 |
+ -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 151 |
# upstream is omitting standard search path for this |
| 152 |
# probably because gcc & clang are bundling their own unwind.h |
| 153 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 154 |
@@ -81,7 +74,7 @@ multilib_src_configure() { |
| 155 |
|
| 156 |
build_libcxx() { |
| 157 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 158 |
- local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx |
| 159 |
+ local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 160 |
local BUILD_DIR=${BUILD_DIR}/libcxx |
| 161 |
local mycmakeargs=( |
| 162 |
-DLIBCXX_LIBDIR_SUFFIX= |
Archives