From ec38ce6bfbb5a812092d324b53b5434e6726d6f1 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Wed, 8 Feb 2012 16:33:34 +0000
Subject: Don't pass compile/link flags on command line to bjam (slow) Instead,
 alter Jamroot.jam to have our configuration options

---
 www-apps/project2/Manifest            | 2 +-
 www-apps/project2/project2-658.ebuild | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index ac3c346..bc6cb60 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -1,5 +1,5 @@
 EBUILD project2-654.ebuild 1651 RMD160 84298e22e58fd87b4966f6cd3f704a39807ca941 SHA1 131d85985247d9f3854e70cb3bcc0a81ebbd2281 SHA256 146635bdf0d631a6c74f2395a6452e73c5a904433c655320d80d1fd3093f18f8
 EBUILD project2-655.ebuild 1651 RMD160 84298e22e58fd87b4966f6cd3f704a39807ca941 SHA1 131d85985247d9f3854e70cb3bcc0a81ebbd2281 SHA256 146635bdf0d631a6c74f2395a6452e73c5a904433c655320d80d1fd3093f18f8
 EBUILD project2-656.ebuild 1651 RMD160 84298e22e58fd87b4966f6cd3f704a39807ca941 SHA1 131d85985247d9f3854e70cb3bcc0a81ebbd2281 SHA256 146635bdf0d631a6c74f2395a6452e73c5a904433c655320d80d1fd3093f18f8
-EBUILD project2-658.ebuild 1651 RMD160 84298e22e58fd87b4966f6cd3f704a39807ca941 SHA1 131d85985247d9f3854e70cb3bcc0a81ebbd2281 SHA256 146635bdf0d631a6c74f2395a6452e73c5a904433c655320d80d1fd3093f18f8
+EBUILD project2-658.ebuild 1705 RMD160 f8d5d181b9490d999082f8e73b6bd506d49ceba3 SHA1 13e45e8de3bdae0dd4dbb0ca67613d3bc84fdbe0 SHA256 c3325105cafc8b8ceeab7c904b73cda729b8f674446f74a88d3a1b1aa52423cf
 EBUILD project2-9999.ebuild 1621 RMD160 2a922298c20b4b559309cc45d8bd7bddf649528d SHA1 c5e062b4a6c14f651f5b08eef5f768866bb2e03e SHA256 3819ecbde99a5068ff35b18086ca13344e80763c00c0f312ff8a1e830827e48e
diff --git a/www-apps/project2/project2-658.ebuild b/www-apps/project2/project2-658.ebuild
index 5913fc5..3f43140 100644
--- a/www-apps/project2/project2-658.ebuild
+++ b/www-apps/project2/project2-658.ebuild
@@ -38,12 +38,16 @@ use console && bt="$bt p2console" && it="$it installp2con"
 use web && bt="$bt p2cgi" && it="$it installp2cgi"
 use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
 
+src_prepare() {
+	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
+}
+
 src_compile() {
 	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
 	cd ${S}/project2 || die
 	setarch $(uname -m) -RL \
 			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${pq} ${bt} -q \
-			cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Compile failed"
+			|| die "Compile failed"
 }
 
 src_install() {
@@ -52,7 +56,7 @@ src_install() {
 	setarch $(uname -m) -RL \
 			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${pq} ${it} -q \
 			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Installed failed"
+			|| die "Installed failed"
 	if use docs ; then
 		mkdir -p ${D}/usr/share/doc/${PN}
 		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-- 
cgit v1.2.3