From 3a5b0b7bf633c6ec65179bed945d8e3f661d287e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 20 Apr 2007 11:27:41 +0000 Subject: [PATCH] Better handling of CXXFLAGS Package-Manager: portage-2.1.2.4 --- net-irc/znc/ChangeLog | 5 ++++- net-irc/znc/Manifest | 16 ++++++++-------- net-irc/znc/znc-0.047.ebuild | 18 +++++++++++++++--- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog index a3a635d095ef..baba98bde706 100644 --- a/net-irc/znc/ChangeLog +++ b/net-irc/znc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-irc/znc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.1 2007/04/20 10:09:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.2 2007/04/20 11:27:41 armin76 Exp $ + + 20 Apr 2007; Raúl Porcel znc-0.047.ebuild: + Better handling of CXXFLAGS *znc-0.047 (20 Apr 2007) diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest index 6104a26dbff4..6406f4c55ebe 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -1,12 +1,12 @@ DIST znc-0.047.tar.gz 414605 RMD160 43476e1d6ef049c913efafd40a1401bcbeab0686 SHA1 2cbfc142e9468c48965a5587f94a268a491af731 SHA256 94cdb00d9f7f87f119efbd6737c7ead1b0bd42fd4cbb3f5b3513e7b868e327d9 -EBUILD znc-0.047.ebuild 1157 RMD160 c5c7a9cab5539e5b740badaef4bfedef7ec4569d SHA1 d83439beaf7770da54c0d7cd0ea99710ef8f5ed7 SHA256 c7d4853dc3e3ae39f43f098a7defbdb7d560a240258cc91dcfb2e6d65c358dbe -MD5 81c2bd9f05224e07b64b38f380962216 znc-0.047.ebuild 1157 -RMD160 c5c7a9cab5539e5b740badaef4bfedef7ec4569d znc-0.047.ebuild 1157 -SHA256 c7d4853dc3e3ae39f43f098a7defbdb7d560a240258cc91dcfb2e6d65c358dbe znc-0.047.ebuild 1157 -MISC ChangeLog 400 RMD160 6062a0ce49ce6ec812d64f35eb1a14ba321256b7 SHA1 e1e167777c995a44c9c743b6a895dba3f0a28faf SHA256 4d3e228e165a7a88046887973f83eaf402cfd99672fc026989183f5d07738f48 -MD5 23fa2ae9a34af85b9236bc2817d94950 ChangeLog 400 -RMD160 6062a0ce49ce6ec812d64f35eb1a14ba321256b7 ChangeLog 400 -SHA256 4d3e228e165a7a88046887973f83eaf402cfd99672fc026989183f5d07738f48 ChangeLog 400 +EBUILD znc-0.047.ebuild 1316 RMD160 7ad02e21caac1bf895e76a59724eb9a6142bb6b9 SHA1 b6dbc4c82390b91af130e176c3a957b264e82756 SHA256 5f71a29ecbfdbcb2b6523fed435cb8c0109c6d39d279154c8608f7a29db106ad +MD5 11178a39faec5d49462e2e9c488713e5 znc-0.047.ebuild 1316 +RMD160 7ad02e21caac1bf895e76a59724eb9a6142bb6b9 znc-0.047.ebuild 1316 +SHA256 5f71a29ecbfdbcb2b6523fed435cb8c0109c6d39d279154c8608f7a29db106ad znc-0.047.ebuild 1316 +MISC ChangeLog 498 RMD160 c3e32ffd6711bc2422318c95b219e43a77b2f699 SHA1 a7e669b9880caa1e895d4e7db460b890736515a4 SHA256 fdb4a7a06da6e8e23a92bdb757446a5e6cf177a3395d09af3147e936786c5a03 +MD5 390d6e1706c91a1bc1a519b28b2cdc72 ChangeLog 498 +RMD160 c3e32ffd6711bc2422318c95b219e43a77b2f699 ChangeLog 498 +SHA256 fdb4a7a06da6e8e23a92bdb757446a5e6cf177a3395d09af3147e936786c5a03 ChangeLog 498 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160 diff --git a/net-irc/znc/znc-0.047.ebuild b/net-irc/znc/znc-0.047.ebuild index f7f235deb6d0..f72f8204f425 100644 --- a/net-irc/znc/znc-0.047.ebuild +++ b/net-irc/znc/znc-0.047.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-0.047.ebuild,v 1.1 2007/04/20 10:09:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-0.047.ebuild,v 1.2 2007/04/20 11:27:41 armin76 Exp $ + +inherit autotools DESCRIPTION="An advanced IRC Bouncer" HOMEPAGE="http://znc.sourceforge.net" @@ -15,6 +17,18 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d ) perl? ( dev-lang/perl )" RDEPEND="${DEPEND}" +src_unpack() { + unpack ${A} + cd "${S}" + + # Respect CFLAGS and don't strip + sed -i -e "s/-Wall -s -O2 -fomit-frame-pointer/-Wall/g" \ + -e "s/CXXFLAGS=\"-D_GNU_SOURCE\"/CXXFLAGS=\"${CXXFLAGS} -D_GNU_SOURCE\"/g" \ + configure.in || die "sed failed" + + eautoreconf +} + src_compile() { econf \ $(use_enable debug) \ @@ -24,8 +38,6 @@ src_compile() { $(use_enable ssl openssl) \ || die "econf failed" - # Remove -s from CXXFLAGS as emerge handles stripping - sed -e 's/ -s / /' -i Makefile modules/Makefile || die "sed failed" emake || die "emake failed" } -- 2.26.2