Force configure not to inject all kinds of -Werror crap (bug #148230)

Package-Manager: portage-2.1.1

3 files changed, 22 insertions, 26 deletions

diff --git a/dev-db/monetdb/Manifest b/dev-db/monetdb/Manifest
index 71f8de717c98..730c7e4eab6a 100644
--- a/dev-db/monetdb/Manifest
+++ b/dev-db/monetdb/Manifest
@@ -71,14 +71,14 @@ EBUILD monetdb-4.10.0.ebuild 7526 RMD160 cc9a192c1f80f09227562d512accfd92134ab03
 MD5 8557bb0be949cf82043b3a3e782d83f0 monetdb-4.10.0.ebuild 7526
 RMD160 cc9a192c1f80f09227562d512accfd92134ab033 monetdb-4.10.0.ebuild 7526
 SHA256 175b6404c66ad0a81bc32dc84389bfd6d03d80643cd4dfd12ad5ccf0d3fd7ebf monetdb-4.10.0.ebuild 7526
-EBUILD monetdb-4.10.2.ebuild 7539 RMD160 cc71338686263db77d18a4a401fa22f49f137802 SHA1 e7d9350e3da984a5a26a11be1cdbd051bba2bd4a SHA256 cca922b22a1c6acbeecacd867180ce042d27c0249a72bd02c52640601ab9a70a
-MD5 437e345120db3efa05568ef6f1f34f65 monetdb-4.10.2.ebuild 7539
-RMD160 cc71338686263db77d18a4a401fa22f49f137802 monetdb-4.10.2.ebuild 7539
-SHA256 cca922b22a1c6acbeecacd867180ce042d27c0249a72bd02c52640601ab9a70a monetdb-4.10.2.ebuild 7539
-EBUILD monetdb-4.12.0.ebuild 7250 RMD160 5192e5ee3d3d52b577057d3cc85b421b83fa2a87 SHA1 2ea83ea8cb5cf6ac6801d47241bfd0a7ef0f6e7f SHA256 244a8e89a06b9b0d7910669e7f342d65d857ee80613b899c588b2a26d6ef858a
-MD5 79010517ea1439a36bd5a358e91932c2 monetdb-4.12.0.ebuild 7250
-RMD160 5192e5ee3d3d52b577057d3cc85b421b83fa2a87 monetdb-4.12.0.ebuild 7250
-SHA256 244a8e89a06b9b0d7910669e7f342d65d857ee80613b899c588b2a26d6ef858a monetdb-4.12.0.ebuild 7250
+EBUILD monetdb-4.10.2.ebuild 7667 RMD160 29dc1b82ce6a739d7bad4732421abe66b41716a1 SHA1 f8bc2fb25c4bbb372addd26e3b05f5e2da7b464a SHA256 47ddc7c4bbed7bde3407e850681138884902240b7cf0b68c03f31d3adeebf51d
+MD5 a3ce544643656a2ee7f08b43dd337b67 monetdb-4.10.2.ebuild 7667
+RMD160 29dc1b82ce6a739d7bad4732421abe66b41716a1 monetdb-4.10.2.ebuild 7667
+SHA256 47ddc7c4bbed7bde3407e850681138884902240b7cf0b68c03f31d3adeebf51d monetdb-4.10.2.ebuild 7667
+EBUILD monetdb-4.12.0.ebuild 7327 RMD160 d6657e684774c37ca672222eeeebec12fe365a1e SHA1 468e40b61a0c07950af37eb350f8da8a3e642d49 SHA256 643a3e1006d4d809e45fa18b1b52b5b3dadf8c6ca690cea9924f1feec64b5c4a
+MD5 37f5befa8ff51adc95b1ba2617163643 monetdb-4.12.0.ebuild 7327
+RMD160 d6657e684774c37ca672222eeeebec12fe365a1e monetdb-4.12.0.ebuild 7327
+SHA256 643a3e1006d4d809e45fa18b1b52b5b3dadf8c6ca690cea9924f1feec64b5c4a monetdb-4.12.0.ebuild 7327
 MISC ChangeLog 2887 RMD160 11f4395ed11f0cd11b837a875e9e7b01f4729036 SHA1 9044f22287cb27faa6cecdbee2a6e2126baf93a2 SHA256 405768701d9903dbf57fcbe224b2e9bd1e4086d393e8e68faa614134322ee590
 MD5 7951364ff8cda52ed50962fb6a3fa2dc ChangeLog 2887
 RMD160 11f4395ed11f0cd11b837a875e9e7b01f4729036 ChangeLog 2887
diff --git a/dev-db/monetdb/monetdb-4.10.2.ebuild b/dev-db/monetdb/monetdb-4.10.2.ebuild
index f58375461ab5..5db982faaab2 100644
--- a/dev-db/monetdb/monetdb-4.10.2.ebuild
+++ b/dev-db/monetdb/monetdb-4.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.10.2.ebuild,v 1.5 2006/06/17 18:23:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.10.2.ebuild,v 1.6 2006/09/20 08:17:11 grobian Exp $
 
 inherit flag-o-matic eutils
 
@@ -68,14 +68,11 @@ src_compile() {
 	# The tar has capitals, the ebuild doesn't...
 	cd "${WORKDIR}/MonetDB-${PV_M}"
 
-	local myconf=""
-
-	if use debug;
-	then
-		myconf="${myconf} --enable-debug"
-	else
-		myconf="${myconf} --enable-optimize --disable-assert"
-	fi
+	# setting these respects the user's CFLAGS and disables -Werror etc.
+	local myconf="--disable-optimize --disable-debug"
+	sed -i \
+		-e 's|CFLAGS="\$CFLAGS \\\$(X_CFLAGS)"||' \
+		configure || die "failed fixing configure"
 
 	# Gentoo's amd64 doesn't allow 32-bits monetdb to compile, hence we switch
 	# to 64-bits Mserver here.  Note that this also gives 64-bits OIDs.
@@ -83,6 +80,7 @@ src_compile() {
 
 	myconf="${myconf} $(use_with java)"
 	myconf="${myconf} $(use_with readline)"
+	myconf="${myconf} $(use_enable debug assert)"
 
 	econf ${myconf} || die "econf monetdb failed"
 
diff --git a/dev-db/monetdb/monetdb-4.12.0.ebuild b/dev-db/monetdb/monetdb-4.12.0.ebuild
index ce7653af22d9..b9db1386e4aa 100644
--- a/dev-db/monetdb/monetdb-4.12.0.ebuild
+++ b/dev-db/monetdb/monetdb-4.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.12.0.ebuild,v 1.1 2006/06/23 19:40:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.12.0.ebuild,v 1.2 2006/09/20 08:17:11 grobian Exp $
 
 inherit flag-o-matic eutils
 
@@ -68,21 +68,19 @@ src_compile() {
 	# The tar has capitals, the ebuild doesn't...
 	cd "${WORKDIR}/MonetDB-${PV_M}"
 
-	local myconf=""
+	# setting these respects the user's CFLAGS and disables -Werror etc.
+	local myconf="--disable-optimize --disable-debug"
+	sed -i \
+		-e 's|CFLAGS="\$CFLAGS \\\$(X_CFLAGS)"||' \
+		configure || die "failed fixing configure"
 
 	# Gentoo's amd64 doesn't allow 32-bits monetdb to compile, hence we switch
 	# to 64-bits Mserver here.  Note that this also gives 64-bits OIDs.
 	use amd64 && myconf="${myconf} --enable-bits=64"
 
-	if use debug;
-	then
-		myconf="${myconf} --disable-optimize --enable-assert --enable-debug"
-	else
-		myconf="${myconf} --enable-optimize --disable-assert --disable-debug"
-	fi
-
 	myconf="${myconf} $(use_with java)"
 	myconf="${myconf} $(use_with readline)"
+	myconf="${myconf} $(use_enable debug assert)"
 
 	econf ${myconf} || die "econf monetdb failed"