summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2009-01-05 18:17:19 +0000
committerChristoph Mende <angelos@gentoo.org>2009-01-05 18:17:19 +0000
commitad8f803362b4f29ec907a31cf94f727e7e46a3a5 (patch)
treeee0607344e0d0fb9f18b5270c56445427d0958eb
parentStable for HPPA (bug #252321). (diff)
downloadgentoo-2-ad8f803362b4f29ec907a31cf94f727e7e46a3a5.tar.gz
gentoo-2-ad8f803362b4f29ec907a31cf94f727e7e46a3a5.tar.bz2
gentoo-2-ad8f803362b4f29ec907a31cf94f727e7e46a3a5.zip
QA: Fixed compilation with --as-needed (bug 248090), respect LDFLAGS, added missing intltool dependency (bug 233066)
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-dirty x86_64)
-rw-r--r--net-misc/gip/ChangeLog9
-rw-r--r--net-misc/gip/files/gip-1.6.1.1-asneeded.patch11
-rw-r--r--net-misc/gip/gip-1.6.1.1.ebuild9
3 files changed, 24 insertions, 5 deletions
diff --git a/net-misc/gip/ChangeLog b/net-misc/gip/ChangeLog
index e02edc167624..0eac6ca7a277 100644
--- a/net-misc/gip/ChangeLog
+++ b/net-misc/gip/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/gip
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/ChangeLog,v 1.16 2008/07/22 04:03:09 darkside Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/ChangeLog,v 1.17 2009/01/05 18:17:19 angelos Exp $
+
+ 05 Jan 2009; Christoph Mende <angelos@gentoo.org>
+ +files/gip-1.6.1.1-asneeded.patch, gip-1.6.1.1.ebuild:
+ QA: Fixed compilation with --as-needed (bug 248090), respect LDFLAGS,
+ added missing intltool dependency (bug 233066)
20 Jul 2008; Jeremy Olexa <darkside@gentoo.org>
+files/gip-1.6.1.1-libsigcpp.patch, gip-1.6.1.1.ebuild:
diff --git a/net-misc/gip/files/gip-1.6.1.1-asneeded.patch b/net-misc/gip/files/gip-1.6.1.1-asneeded.patch
new file mode 100644
index 000000000000..31f510073612
--- /dev/null
+++ b/net-misc/gip/files/gip-1.6.1.1-asneeded.patch
@@ -0,0 +1,11 @@
+--- installer/build_files.sh.orig 2005-09-13 20:20:31.000000000 +0200
++++ installer/build_files.sh 2009-01-05 19:08:00.144971152 +0100
+@@ -122,7 +122,7 @@
+ if [ "$SHARED" = "" ]; then
+ # Link as an executable.
+ set -x
+- g++ $CFLAGS $LFLAGS -o $OUTFILE $OBJECTFILES
++ g++ $CFLAGS $LDFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
+ ERR="$?"
+ set +x
+ else
diff --git a/net-misc/gip/gip-1.6.1.1.ebuild b/net-misc/gip/gip-1.6.1.1.ebuild
index e78f1f9b42bc..f8b00ebc761a 100644
--- a/net-misc/gip/gip-1.6.1.1.ebuild
+++ b/net-misc/gip/gip-1.6.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.6.1.1.ebuild,v 1.7 2008/07/20 18:31:31 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.6.1.1.ebuild,v 1.8 2009/01/05 18:17:19 angelos Exp $
inherit versionator distutils
@@ -19,6 +19,7 @@ RDEPEND=">=dev-cpp/gtkmm-2.4
>=dev-libs/libsigc++-2.0"
DEPEND="${RDEPEND}
+ dev-util/intltool
dev-util/pkgconfig"
S="${WORKDIR}/${MY_P}"
@@ -26,7 +27,9 @@ S="${WORKDIR}/${MY_P}"
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}/${P}-libsigcpp.patch"
+ epatch "${FILESDIR}/${P}-libsigcpp.patch" \
+ "${FILESDIR}"/${P}-asneeded.patch
+ sed -i -e "s:g++:$(tc-getCXX):" installer/build_files.sh
}
src_compile() {