diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-08-10 13:19:15 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-08-10 13:19:15 +0000 |
| commit | ec7fd429cbaf317914596f92b44fa37bcf39de95 (patch) | |
| tree | 3384a1cdf40b6a9c261f0c36f257161f272be4f0 /app-admin | |
| parent | Drop unused patch. (diff) | |
| download | gentoo-2-ec7fd429cbaf317914596f92b44fa37bcf39de95.tar.gz gentoo-2-ec7fd429cbaf317914596f92b44fa37bcf39de95.tar.bz2 gentoo-2-ec7fd429cbaf317914596f92b44fa37bcf39de95.zip | |
Respect CC,CFLAGS,LDFLAGS. Bug #331879. Thanks to Diego E. 'Flameeyes' for reporting
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/osiris/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/osiris/osiris-4.2.3.ebuild | 22 |
2 files changed, 23 insertions, 7 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/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() { |