Respect CC,CFLAGS,LDFLAGS. Bug #331879. Thanks to Diego E. 'Flameeyes' for reporting

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 25 insertions, 19 deletions

diff --git a/app-admin/osiris/ChangeLog b/app-admin/osiris/ChangeLog
index 4bf32a59024c..21150a905ab5 100644
--- a/app-admin/osiris/ChangeLog
+++ b/app-admin/osiris/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/osiris
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.18 2009/01/05 10:05:48 angelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.19 2010/08/10 13:19:15 hwoarang Exp $
+
+  10 Aug 2010; Markos Chandras <hwoarang@gentoo.org> osiris-4.2.3.ebuild:
+  Respect CC,CFLAGS,LDFLAGS. Bug #331879. Thanks to Diego E. 'Flameeyes'
+  Pettenò <flameeyes@gentoo.org> for reporting
 
   05 Jan 2009; Christoph Mende <angelos@gentoo.org> osiris-4.2.3.ebuild:
   QA: Added die to dosbin
diff --git a/app-admin/osiris/Manifest b/app-admin/osiris/Manifest
index 55678e4f7921..475fa471ef38 100644
--- a/app-admin/osiris/Manifest
+++ b/app-admin/osiris/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX osirisd-4.2.3 591 RMD160 7aec89e9cefb51427934cf6af00d5871f155b4a3 SHA1 b073bef9e63fcd6d84e15336c8c08078a03e9610 SHA256 e1b01914c463994e2620debe36122a9e9532931023cc77a308bc30867055c1e0
 AUX osirisd_confd-4.2.3 267 RMD160 e6418261bd62c674d746a454d053ba2fdd60e8ba SHA1 fc50b163ceca4276c90f300a44f8b5f37bdb8d4d SHA256 4ad91c2f2ecc24688a0f38b54a4291ddd4448e5772c0c25a7883e96ff98fa3d1
 AUX osirismd-4.2.3 592 RMD160 7a80e99bdaa725ea123de69125ff9c4c7d36e3d1 SHA1 31ae2903933ff2e1ca8c26fcf83c6e3fdbf5c47e SHA256 aaf460d5406679bf09c5f63a04d6216f412b8144ae7f51681de9e7ebc90e1b5f
@@ -10,13 +7,6 @@ DIST mod_nvram.tar.gz 2065 RMD160 6f5beab396bd2011b0db386999c19da9d83c3881 SHA1
 DIST mod_ports.tar.gz 3730 RMD160 63ee90b2cf074be67d4d9a0e0a5fec02a57971c1 SHA1 6a94f32643486c010f41736c374aa0f60c70a77f SHA256 29918056c92802666ef80b7e997edb732045584e4d7f05841dab8e240bf0d71c
 DIST mod_uptime.tar.gz 2143 RMD160 7a626a37825a867a88eed2223f737dd5e521c69c SHA1 c18135c52a4a26178046a7c57beb9eb7e7e307e9 SHA256 9538ce2a41f55f9ea629a08f643e2ca9d1130428dc25b2cee006108fc087dc78
 DIST osiris-4.2.3.tar.gz 1924149 RMD160 2254aed0ec5d7c2d617311d469599575269757ff SHA1 128ebdeec31ff86aecbff6150ef6d0c7dcb4820f SHA256 94e1f28a6dc24e85efb47383126cf3bad35db8a7d47a8025e77bb6f0730c3b04
-EBUILD osiris-4.2.3.ebuild 3035 RMD160 ab60578c5376b00616217ae934ba90a775281efc SHA1 73af2e64077b95f81e239f01b925d3539c486c8e SHA256 8d7968882cadf9a15a2c711197e8f07c569b6265deac070682f6da31e5b63f50
-MISC ChangeLog 2764 RMD160 cec2c6a09f655a95c938a2cd4e088fe3ab8b9e80 SHA1 f617f151bd3d1a72af0b0a8c712413b9e12c28c3 SHA256 3d3f6e1620419d6bec4fd0c0fdd883cc77d28f39d8fa30ea32afb589f32df8d9
+EBUILD osiris-4.2.3.ebuild 3529 RMD160 02a8c7bdbfa392eb30ee71a390b15b8bd7d9bd7c SHA1 3aec2e7346eb631297ecc5843d980b7fec87995e SHA256 6514e3eb85694c04a44fffb9b9e94cd195d0441c872147dd9602da43736f80b6
+MISC ChangeLog 2961 RMD160 888f22e849deb04eb7b4031e86cb61c14e306589 SHA1 7dde3473166b17598536dc4b359f6cc22b71f301 SHA256 e12fad70ae60f101ed3e38be880858d672d0f8cb980ab74c25e9b56b8786c486
 MISC metadata.xml 417 RMD160 41979d47436ed19c0fcaa1790a1cdac349f96c55 SHA1 dfa2566a981d0ddb4764f0650a1ab05d188203fe SHA256 3e2715f17a6ef91fd0ac3589cfa72f19ec911bd7fc513826a638440f212bc22d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklh24QACgkQKhnDs22gwa/LJQCgqpph8s6M+zE44C55mg1fD3BS
-CqQAoPyKkYMGDxjw3XqikDVQWStdHcnL
-=Bqy5
------END PGP SIGNATURE-----
diff --git a/app-admin/osiris/osiris-4.2.3.ebuild b/app-admin/osiris/osiris-4.2.3.ebuild
index fe82dae6eff8..69a89003a7f5 100644
--- a/app-admin/osiris/osiris-4.2.3.ebuild
+++ b/app-admin/osiris/osiris-4.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-4.2.3.ebuild,v 1.2 2009/01/05 10:05:48 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-4.2.3.ebuild,v 1.3 2010/08/10 13:19:15 hwoarang Exp $
 
-inherit eutils
+inherit toolchain-funcs autotools eutils
 
 DESCRIPTION="File integrity verification system"
 HOMEPAGE="http://osiris.shmoo.com/"
@@ -36,13 +36,25 @@ src_unpack()
 	unpack mod_ports.tar.gz
 	# Add the above modules
 	mv "${S}"/../mod_* "${S}"/src/osirisd/modules/
+	# Respect LDFLAGS
+	cd "${S}"
+	sed -i "s:\$CFLAGS:& ${LDFLAGS} :" "${S}"/configure.ac
+	sed -i -e "/^CPPFLAGS/s: =.* : = ${CXXFLAGS} :" \
+		-e "/^LDFLAGS/s: =.* : = ${LDFLAGS} :" \
+		"${S}"/src/osirisd/modules/Makefile.in
+	sed -i "/^COMPILE/{n; s:\$(CFLAGS):& \$(LDFLAGS) :}" \
+		"${S}"/src/osirisd/Makefile.in
+	for x in $(find "${S}/src/osirisd/modules/" -name "Makefile"); do
+		sed -i "s:\$(CFLAGS):& \$(LDFLAGS) :" $x
+	done
+	eautoconf
 }
 
 src_compile()
 {
 	econf --prefix=/var/lib --enable-fancy-cli=yes
-	emake agent || die "agent build failed"
-	emake console || die "management build failed"
+	emake CC=$(tc-getCC) agent || die "agent build failed"
+	emake CC=$(tc-getCC) console || die "management build failed"
 }
 
 src_install() {