| 1 |
commit: 4ae3692f2acf6307068366779505aecec3f2254a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 1 08:34:54 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 1 13:15:55 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae3692f |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Switch live to monorepo |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild | 17 ++++++----------- |
| 13 |
sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild | 19 +++++++------------ |
| 14 |
2 files changed, 13 insertions(+), 23 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild |
| 17 |
index edc18f6fea9..8a1fd469ee7 100644 |
| 18 |
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild |
| 19 |
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild |
| 20 |
@@ -13,8 +13,8 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 |
| 21 |
DESCRIPTION="Low level support for a standard C++ library" |
| 22 |
HOMEPAGE="https://libcxxabi.llvm.org/" |
| 23 |
SRC_URI="" |
| 24 |
-EGIT_REPO_URI="https://git.llvm.org/git/libcxxabi.git |
| 25 |
- https://github.com/llvm-mirror/libcxxabi.git" |
| 26 |
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 27 |
+S=${WORKDIR}/${P}/libcxxabi |
| 28 |
|
| 29 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 30 |
SLOT="0" |
| 31 |
@@ -49,14 +49,9 @@ pkg_setup() { |
| 32 |
} |
| 33 |
|
| 34 |
src_unpack() { |
| 35 |
- # we need the headers |
| 36 |
- git-r3_fetch "https://git.llvm.org/git/libcxx.git |
| 37 |
- https://github.com/llvm-mirror/libcxx.git" |
| 38 |
git-r3_fetch |
| 39 |
- |
| 40 |
- git-r3_checkout https://llvm.org/git/libcxx.git \ |
| 41 |
- "${WORKDIR}"/libcxx '' |
| 42 |
- git-r3_checkout |
| 43 |
+ # we always need libcxx for the headers |
| 44 |
+ git-r3_checkout '' '' '' libcxx{,abi} |
| 45 |
} |
| 46 |
|
| 47 |
multilib_src_configure() { |
| 48 |
@@ -68,7 +63,7 @@ multilib_src_configure() { |
| 49 |
-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 50 |
-DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 51 |
|
| 52 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 53 |
+ -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include |
| 54 |
# upstream is omitting standard search path for this |
| 55 |
# probably because gcc & clang are bundling their own unwind.h |
| 56 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 57 |
@@ -89,7 +84,7 @@ multilib_src_configure() { |
| 58 |
|
| 59 |
build_libcxx() { |
| 60 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 61 |
- local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 62 |
+ local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx |
| 63 |
local BUILD_DIR=${BUILD_DIR}/libcxx |
| 64 |
local mycmakeargs=( |
| 65 |
-DLIBCXX_LIBDIR_SUFFIX= |
| 66 |
|
| 67 |
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild |
| 68 |
index 70fcb998c05..591bf45eca8 100644 |
| 69 |
--- a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild |
| 70 |
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild |
| 71 |
@@ -13,9 +13,9 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 |
| 72 |
DESCRIPTION="Low level support for a standard C++ library" |
| 73 |
HOMEPAGE="https://libcxxabi.llvm.org/" |
| 74 |
SRC_URI="" |
| 75 |
-EGIT_REPO_URI="https://git.llvm.org/git/libcxxabi.git |
| 76 |
- https://github.com/llvm-mirror/libcxxabi.git" |
| 77 |
-EGIT_BRANCH="release_90" |
| 78 |
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 79 |
+EGIT_BRANCH="release/9.x" |
| 80 |
+S=${WORKDIR}/${P}/libcxxabi |
| 81 |
|
| 82 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 83 |
SLOT="0" |
| 84 |
@@ -50,14 +50,9 @@ pkg_setup() { |
| 85 |
} |
| 86 |
|
| 87 |
src_unpack() { |
| 88 |
- # we need the headers |
| 89 |
- git-r3_fetch "https://git.llvm.org/git/libcxx.git |
| 90 |
- https://github.com/llvm-mirror/libcxx.git" |
| 91 |
git-r3_fetch |
| 92 |
- |
| 93 |
- git-r3_checkout https://llvm.org/git/libcxx.git \ |
| 94 |
- "${WORKDIR}"/libcxx '' |
| 95 |
- git-r3_checkout |
| 96 |
+ # we always need libcxx for the headers |
| 97 |
+ git-r3_checkout '' '' '' libcxx{,abi} |
| 98 |
} |
| 99 |
|
| 100 |
multilib_src_configure() { |
| 101 |
@@ -69,7 +64,7 @@ multilib_src_configure() { |
| 102 |
-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 103 |
-DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 104 |
|
| 105 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 106 |
+ -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include |
| 107 |
# upstream is omitting standard search path for this |
| 108 |
# probably because gcc & clang are bundling their own unwind.h |
| 109 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 110 |
@@ -90,7 +85,7 @@ multilib_src_configure() { |
| 111 |
|
| 112 |
build_libcxx() { |
| 113 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 114 |
- local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 115 |
+ local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx |
| 116 |
local BUILD_DIR=${BUILD_DIR}/libcxx |
| 117 |
local mycmakeargs=( |
| 118 |
-DLIBCXX_LIBDIR_SUFFIX= |
Archives