commit: ff8ce32f1cf8e129d2ee9a7fd62adfb7478fe61d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 10:35:39 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 15:25:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8ce32f
sys-devel/llvm: Stop using custom build type in -9999
Switch -9999 to use standard CMAKE_BUILD_TYPE=RelWithDebInfo following
the eclass and sys-devel/cmake changes to make it non-intrusive
and Gentoo-friendly. This lets us skip hacking custom build type support
in, and get a more well-defined behavior upstream.
.../0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch | 0
sys-devel/llvm/llvm-3.8.1-r2.ebuild | 2 +-
sys-devel/llvm/llvm-3.8.1.ebuild | 2 +-
sys-devel/llvm/llvm-3.9.0-r1.ebuild | 2 +-
sys-devel/llvm/llvm-3.9.1.ebuild | 2 +-
sys-devel/llvm/llvm-9999.ebuild | 10 +++++-----
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
b/sys-devel/llvm/files/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
similarity index 100%
rename from
sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
rename to
sys-devel/llvm/files/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 9eff8cd..5ba7822 100644
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -174,7 +174,7 @@ src_prepare() {
eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch
# Allow custom cmake build types (like 'Gentoo')
- eapply
"${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
+ eapply
"${FILESDIR}"/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
# Fix llvm-config for shared linking and sane flags
# https://bugs.gentoo.org/show_bug.cgi?id=565358
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index fb0575f..dcc8353 100644
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -175,7 +175,7 @@ src_prepare() {
eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch
# Allow custom cmake build types (like 'Gentoo')
- eapply
"${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
+ eapply
"${FILESDIR}"/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
# Fix llvm-config for shared linking and sane flags
# https://bugs.gentoo.org/show_bug.cgi?id=565358
diff --git a/sys-devel/llvm/llvm-3.9.0-r1.ebuild
b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
index 905de6c..814931b 100644
--- a/sys-devel/llvm/llvm-3.9.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
@@ -181,7 +181,7 @@ src_prepare() {
eapply
"${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
# Allow custom cmake build types (like 'Gentoo')
- eapply
"${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
+ eapply
"${FILESDIR}"/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
# Fix llvm-config for shared linking and sane flags
# https://bugs.gentoo.org/show_bug.cgi?id=565358
diff --git a/sys-devel/llvm/llvm-3.9.1.ebuild b/sys-devel/llvm/llvm-3.9.1.ebuild
index 72baa96..6fbfcd8 100644
--- a/sys-devel/llvm/llvm-3.9.1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.1.ebuild
@@ -181,7 +181,7 @@ src_prepare() {
eapply
"${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
# Allow custom cmake build types (like 'Gentoo')
- eapply
"${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
+ eapply
"${FILESDIR}"/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
# Fix llvm-config for shared linking and sane flags
# https://bugs.gentoo.org/show_bug.cgi?id=565358
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 94c3a7d..16e670c 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -5,8 +5,8 @@
EAPI=6
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to lib32 find_library fix)
-CMAKE_MIN_VERSION=3.6.1-r1
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
PYTHON_COMPAT=( python2_7 )
inherit check-reqs cmake-utils flag-o-matic git-r3 \
@@ -63,6 +63,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( ${ALL_LLVM_TARGETS[*]} )
multitarget? ( ${ALL_LLVM_TARGETS[*]} )"
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
python_check_deps() {
! use test \
|| has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -110,9 +113,6 @@ src_prepare() {
# Python is needed to run tests using lit
python_setup
- # Allow custom cmake build types (like 'Gentoo')
- eapply
"${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
-
# Fix llvm-config for shared linking and sane flags
# https://bugs.gentoo.org/show_bug.cgi?id=565358
eapply
"${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
