diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-21 09:45:32 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-21 09:45:32 +0000 |
| commit | c801148be91c7bab8182486e8411ef4b5c272c77 (patch) | |
| tree | 1a1e2cdea897c48a1f27cb5fee4051be3656aac9 /net-firewall/fwbuilder | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c801148be91c7bab8182486e8411ef4b5c272c77.tar.gz gentoo-2-c801148be91c7bab8182486e8411ef4b5c272c77.tar.bz2 gentoo-2-c801148be91c7bab8182486e8411ef4b5c272c77.zip | |
Respect CFLAGS and CXXFLAGS, bug 372203
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall/fwbuilder')
4 files changed, 35 insertions, 14 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog index c6de7118c322..5dce05c6bf76 100644 --- a/net-firewall/fwbuilder/ChangeLog +++ b/net-firewall/fwbuilder/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/fwbuilder # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.106 2011/07/23 18:26:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.107 2011/08/21 09:45:32 dilfridge Exp $ + + 21 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + fwbuilder-4.2.2.3541.ebuild, +files/fwbuilder-4.2.2.3541-flags.patch, + -files/fwbuilder-4.2.2.3541-ldflags.patch: + Respect CFLAGS and CXXFLAGS, bug 372203 23 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> fwbuilder-4.2.2.3541.ebuild: diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch new file mode 100644 index 000000000000..4da909b7c54f --- /dev/null +++ b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch @@ -0,0 +1,27 @@ +diff -ruN fwbuilder-4.2.2.3541.orig/qmake.inc.in fwbuilder-4.2.2.3541/qmake.inc.in +--- fwbuilder-4.2.2.3541.orig/qmake.inc.in 2011-05-11 23:02:03.000000000 +0200 ++++ fwbuilder-4.2.2.3541/qmake.inc.in 2011-08-21 11:22:11.550158618 +0200 +@@ -16,8 +16,8 @@ + CPPUNIT_LIBS = @CPPUNIT_LIBS@ + + # CONFIG -= nostrip +-# CONFIG += release +-CONFIG += debug ++CONFIG += release nostrip ++# CONFIG += debug + + unix { + PREFIX = @PREFIX@ +@@ -36,9 +36,10 @@ + OBJECTS_DIR = .obj + + QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter +- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter ++ QMAKE_CFLAGS_RELEASE += @CFLAGS@ -Wno-unused-parameter + QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter +- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter ++ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ -Wno-unused-parameter ++ QMAKE_LFLAGS = @LDFLAGS@ + + !macx { + diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ldflags.patch deleted file mode 100644 index f6869db95b83..000000000000 --- a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN fwbuilder-4.2.2.3541.orig/qmake.inc.in fwbuilder-4.2.2.3541/qmake.inc.in ---- fwbuilder-4.2.2.3541.orig/qmake.inc.in 2011-05-11 23:02:03.000000000 +0200 -+++ fwbuilder-4.2.2.3541/qmake.inc.in 2011-05-15 19:36:03.000000000 +0200 -@@ -39,6 +39,7 @@ - QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter - QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter -+ QMAKE_LFLAGS = @LDFLAGS@ - - !macx { - diff --git a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild index 9a053ab331de..1635c8e063db 100644 --- a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild +++ b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.5 2011/07/23 18:26:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.6 2011/08/21 09:45:32 dilfridge Exp $ EAPI=4 @@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-gui-4.3 RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${P}-ldflags.patch" + "${FILESDIR}/${P}-flags.patch" "${FILESDIR}/${P}-ccache.patch" ) |