diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-21 09:28:30 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-21 09:28:30 +0000 |
| commit | e4c09cba3ab5cd4fc2526b3f881272ac8fea2d69 (patch) | |
| tree | 4a6b4145c880557959dcbe3789ec6a1de054ce98 /gnome-base | |
| parent | net-misc/netkit-rwall: Moved to EAPI=4, keyworded for ~amd64 (diff) | |
| download | gentoo-2-e4c09cba3ab5cd4fc2526b3f881272ac8fea2d69.tar.gz gentoo-2-e4c09cba3ab5cd4fc2526b3f881272ac8fea2d69.tar.bz2 gentoo-2-e4c09cba3ab5cd4fc2526b3f881272ac8fea2d69.zip | |
Gold linker fix
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-desktop/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch | 16 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild | 7 |
3 files changed, 27 insertions, 2 deletions
diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog index 26cc3af8bfae..947fff801eed 100644 --- a/gnome-base/gnome-desktop/ChangeLog +++ b/gnome-base/gnome-desktop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-desktop # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.303 2012/05/20 09:59:57 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.304 2012/06/21 09:28:30 jlec Exp $ + + 21 Jun 2012; Justin Lecher <jlec@gentoo.org> + +files/gnome-desktop-2.32.1-gold.patch, gnome-desktop-2.32.1-r1.ebuild: + Gold linker fix *gnome-desktop-3.4.2 (20 May 2012) diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch new file mode 100644 index 000000000000..2e845da46e5b --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch @@ -0,0 +1,16 @@ + libgnome-desktop/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libgnome-desktop/Makefile.in b/libgnome-desktop/Makefile.in +index 39209f6..a57b09e 100644 +--- a/libgnome-desktop/Makefile.in ++++ b/libgnome-desktop/Makefile.in +@@ -388,7 +388,7 @@ libgnome_desktop_2_la_SOURCES = \ + + libgnome_desktop_2_la_LIBADD = \ + $(XLIB_LIBS) \ +- $(GNOME_DESKTOP_LIBS) ++ $(GNOME_DESKTOP_LIBS) -lm + + libgnome_desktop_2_la_LDFLAGS = \ + -version-info $(LT_VERSION) \ diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild index 9156d0e82365..eac70b35bb57 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild,v 1.2 2012/05/05 05:38:10 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild,v 1.3 2012/06/21 09:28:30 jlec Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -54,3 +54,8 @@ pkg_setup() { # If USE=doc, desktop-docs will be built by gnome-desktop:3 DOCS="AUTHORS ChangeLog HACKING NEWS README" } + +src_prepare() { + epatch "${FILESDIR}"/${P}-gold.patch + gnome2_src_prepare +} |