summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2020-03-19 11:27:40 -0400
committerMike Gilbert <floppym@gentoo.org>2020-03-19 11:27:40 -0400
commitadd5f6d75a7b0c5d8aec6e44e48faef59f6d3c96 (patch)
tree091bb51548816849b80898c496853023e8f70c49 /dev-util/ninja
parentdev-util/ninja: version bump to 1.10.0 (diff)
downloadgentoo-add5f6d75a7b0c5d8aec6e44e48faef59f6d3c96.tar.gz
gentoo-add5f6d75a7b0c5d8aec6e44e48faef59f6d3c96.tar.bz2
gentoo-add5f6d75a7b0c5d8aec6e44e48faef59f6d3c96.zip
dev-util/ninja: fixup CFLAGS handling
Package-Manager: Portage-2.3.92_p3, Repoman-2.3.20_p118 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-util/ninja')
-rw-r--r--dev-util/ninja/files/ninja-cflags.patch25
-rw-r--r--dev-util/ninja/ninja-1.10.0.ebuild8
-rw-r--r--dev-util/ninja/ninja-1.9.0.ebuild8
-rw-r--r--dev-util/ninja/ninja-9999.ebuild8
4 files changed, 43 insertions, 6 deletions
diff --git a/dev-util/ninja/files/ninja-cflags.patch b/dev-util/ninja/files/ninja-cflags.patch
new file mode 100644
index 00000000000..0c4ef2813bb
--- /dev/null
+++ b/dev-util/ninja/files/ninja-cflags.patch
@@ -0,0 +1,25 @@
+From e4530769ef6a497f8f5f06159f6be049dc20e2ea Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 19 Mar 2020 11:21:29 -0400
+Subject: [PATCH] Avoid adding -O2 -DNDEBUG to cflags
+
+---
+ configure.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7d8ce90..7566147 100755
+--- a/configure.py
++++ b/configure.py
+@@ -344,8 +344,6 @@ else:
+ if options.debug:
+ cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC']
+ cflags.remove('-fno-rtti') # Needed for above pedanticness.
+- else:
+- cflags += ['-O2', '-DNDEBUG']
+ try:
+ proc = subprocess.Popen(
+ [CXX, '-fdiagnostics-color', '-c', '-x', 'c++', '/dev/null',
+--
+2.25.1
+
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 5275d630026..5e63fdd14f4 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
run_for_build() {
if tc-is-cross-compiler; then
local -x AR=$(tc-getBUILD_AR)
@@ -59,8 +63,8 @@ run_for_build() {
src_compile() {
tc-export AR CXX
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 9bf6dd5f8f9..36783d7d7b6 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -51,6 +51,10 @@ PATCHES=(
"${FILESDIR}/ninja-1.9.0-musl.patch"
)
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
run_for_build() {
if tc-is-cross-compiler; then
local -x AR=$(tc-getBUILD_AR)
@@ -66,8 +70,8 @@ run_for_build() {
src_compile() {
tc-export AR CXX
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index bf75daf0bbb..5d9e2fbb5af 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
run_for_build() {
if tc-is-cross-compiler; then
local -x AR=$(tc-getBUILD_AR)
@@ -59,8 +63,8 @@ run_for_build() {
src_compile() {
tc-export AR CXX
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die