summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-26 12:36:39 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-26 12:36:39 +0000
commite73084ab626e2d84f9dea9f5947367325744854c (patch)
treed43239aca56243d5bf1101caa4e5430485932fe1 /x11-misc/electricsheep
parentFix build error. see #300401. (diff)
downloadgentoo-2-e73084ab626e2d84f9dea9f5947367325744854c.tar.gz
gentoo-2-e73084ab626e2d84f9dea9f5947367325744854c.tar.bz2
gentoo-2-e73084ab626e2d84f9dea9f5947367325744854c.zip
Fix building with -Wl,--as-needed.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/electricsheep')
-rw-r--r--x11-misc/electricsheep/ChangeLog7
-rw-r--r--x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild7
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch13
3 files changed, 23 insertions, 4 deletions
diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index afab343e3b0e..1f85921eea58 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/electricsheep
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.47 2010/02/02 13:00:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.48 2010/02/26 12:36:38 ssuominen Exp $
+
+ 26 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ electricsheep-2.7_beta11.ebuild,
+ +files/electricsheep-2.7_beta11-asneeded.patch:
+ Fix building with -Wl,--as-needed.
02 Feb 2010; Tobias Klausmann <klausman@gentoo.org>
electricsheep-2.7_beta11.ebuild:
diff --git a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
index 16fd3f9468f8..68280c6d23ef 100644
--- a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
+++ b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.4 2010/02/02 13:00:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.5 2010/02/26 12:36:38 ssuominen Exp $
EAPI=2
inherit eutils flag-o-matic autotools
@@ -33,8 +33,9 @@ DEPEND="${DEPEND}
x11-proto/xproto"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-xdg-utils.patch
- epatch "${FILESDIR}"/${PN}-gnome.patch
+ epatch "${FILESDIR}"/${PN}-xdg-utils.patch \
+ "${FILESDIR}"/${PN}-gnome.patch \
+ "${FILESDIR}"/${P}-asneeded.patch
eautoreconf
}
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch
new file mode 100644
index 000000000000..70f746d5ff8b
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch
@@ -0,0 +1,13 @@
+diff -ur electricsheep-2.7_beta11.orig/Makefile.am electricsheep-2.7_beta11/Makefile.am
+--- electricsheep-2.7_beta11.orig/Makefile.am 2009-09-18 00:42:49.000000000 +0300
++++ electricsheep-2.7_beta11/Makefile.am 2010-02-26 14:35:07.000000000 +0200
+@@ -9,7 +9,8 @@
+ pkgdata_DATA = electricsheep-wait.avi electricsheep-preferences.glade
+
+ electricsheep_preferences_CFLAGS = @libglade_CFLAGS@ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
+-electricsheep_preferences_LDFLAGS = @libglade_LIBS@ -export-dynamic
++electricsheep_preferences_LDADD = @libglade_LIBS@
++electricsheep_preferences_LDFLAGS = -export-dynamic
+ electricsheep_preferences_SOURCES = electricsheep-preferences.c utils.c md5.c
+
+