| 1 |
commit: 7be1d385b317055e3f5367c7a952e6760dcc5e12 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 21 09:06:36 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 21 09:15:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be1d385 |
| 7 |
|
| 8 |
sys-libs/libcxx: Remove weird, unmaintainable PV-ifs |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxx/libcxx-10.0.0.9999.ebuild | 21 +++++---------------- |
| 13 |
sys-libs/libcxx/libcxx-9.0.0.9999.ebuild | 23 ++++++----------------- |
| 14 |
2 files changed, 11 insertions(+), 33 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild |
| 17 |
index 04b405e517e..83d8eeaa8c4 100644 |
| 18 |
--- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild |
| 19 |
+++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild |
| 20 |
@@ -8,31 +8,20 @@ EAPI=7 |
| 21 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 22 |
# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
| 23 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 24 |
-EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git |
| 25 |
- https://github.com/llvm-mirror/libcxx.git" |
| 26 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 27 |
|
| 28 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" || SCM="" |
| 29 |
- |
| 30 |
-inherit ${SCM} cmake-multilib llvm multiprocessing python-any-r1 \ |
| 31 |
+inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \ |
| 32 |
toolchain-funcs |
| 33 |
|
| 34 |
DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
| 35 |
HOMEPAGE="https://libcxx.llvm.org/" |
| 36 |
-if [[ ${PV} != *9999 ]] ; then |
| 37 |
- SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz" |
| 38 |
- S="${WORKDIR}/${P}.src" |
| 39 |
-else |
| 40 |
- SRC_URI="" |
| 41 |
-fi |
| 42 |
+SRC_URI="" |
| 43 |
+EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git |
| 44 |
+ https://github.com/llvm-mirror/libcxx.git" |
| 45 |
|
| 46 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 47 |
SLOT="0" |
| 48 |
-if [[ ${PV} != *9999 ]] ; then |
| 49 |
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
| 50 |
-else |
| 51 |
- KEYWORDS="" |
| 52 |
-fi |
| 53 |
+KEYWORDS="" |
| 54 |
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test" |
| 55 |
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) ) |
| 56 |
?? ( libcxxabi libcxxrt )" |
| 57 |
|
| 58 |
diff --git a/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild |
| 59 |
index 2b9a0e1433d..5a84e2f5f99 100644 |
| 60 |
--- a/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild |
| 61 |
+++ b/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild |
| 62 |
@@ -8,32 +8,21 @@ EAPI=7 |
| 63 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 64 |
# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
| 65 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 66 |
-EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git |
| 67 |
- https://github.com/llvm-mirror/libcxx.git" |
| 68 |
-EGIT_BRANCH="release_90" |
| 69 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 70 |
|
| 71 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" || SCM="" |
| 72 |
- |
| 73 |
-inherit ${SCM} cmake-multilib llvm multiprocessing python-any-r1 \ |
| 74 |
+inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \ |
| 75 |
toolchain-funcs |
| 76 |
|
| 77 |
DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
| 78 |
HOMEPAGE="https://libcxx.llvm.org/" |
| 79 |
-if [[ ${PV} != *9999 ]] ; then |
| 80 |
- SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz" |
| 81 |
- S="${WORKDIR}/${P}.src" |
| 82 |
-else |
| 83 |
- SRC_URI="" |
| 84 |
-fi |
| 85 |
+SRC_URI="" |
| 86 |
+EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git |
| 87 |
+ https://github.com/llvm-mirror/libcxx.git" |
| 88 |
+EGIT_BRANCH="release_90" |
| 89 |
|
| 90 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 91 |
SLOT="0" |
| 92 |
-if [[ ${PV} != *9999 ]] ; then |
| 93 |
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
| 94 |
-else |
| 95 |
- KEYWORDS="" |
| 96 |
-fi |
| 97 |
+KEYWORDS="" |
| 98 |
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test" |
| 99 |
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) ) |
| 100 |
?? ( libcxxabi libcxxrt )" |
Archives