diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-06-03 00:49:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-06-03 00:49:17 +0000 |
| commit | 717a061b0b912c7be170c3cc2ea538cc3b8caad2 (patch) | |
| tree | 3bf5b00997ee4fca30d3b1d36ed037633e0f294e | |
| parent | updating maintainer info in metadata.xml (diff) | |
| download | gentoo-2-717a061b0b912c7be170c3cc2ea538cc3b8caad2.tar.gz gentoo-2-717a061b0b912c7be170c3cc2ea538cc3b8caad2.tar.bz2 gentoo-2-717a061b0b912c7be170c3cc2ea538cc3b8caad2.zip | |
Make sure we search custom lib paths before system paths so broken libs dont screw us #94867 by ferret.
(Portage version: 2.0.51.22-r1)
| -rw-r--r-- | media-libs/libjsw/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/libjsw/files/libjsw-1.5.5-liborder.patch | 14 | ||||
| -rw-r--r-- | media-libs/libjsw/libjsw-1.5.5.ebuild | 3 |
3 files changed, 23 insertions, 3 deletions
diff --git a/media-libs/libjsw/ChangeLog b/media-libs/libjsw/ChangeLog index 38dd0091aa6d..110bbc48f574 100644 --- a/media-libs/libjsw/ChangeLog +++ b/media-libs/libjsw/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libjsw -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.8 2005/05/23 15:46:22 herbs Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.9 2005/06/03 00:49:16 vapier Exp $ + + 03 Jun 2005; Mike Frysinger <vapier@gentoo.org> + +files/libjsw-1.5.5-liborder.patch, libjsw-1.5.5.ebuild: + Make sure we search custom lib paths before system paths so broken libs dont + screw us #94867 by ferret. 23 May 2005; Herbie Hopkins <herbs@gentoo.org> libjsw-1.5.5.ebuild: Fixed multilib issue, bug #93672 diff --git a/media-libs/libjsw/files/libjsw-1.5.5-liborder.patch b/media-libs/libjsw/files/libjsw-1.5.5-liborder.patch new file mode 100644 index 000000000000..0def9ba95ad0 --- /dev/null +++ b/media-libs/libjsw/files/libjsw-1.5.5-liborder.patch @@ -0,0 +1,14 @@ +Search our custom $(LIB_DIRS) path before the stuff +gtk-config injects in $(LIBS). + +http://bugs.gentoo.org/94867 + +--- jscalibrator/Makefile ++++ jscalibrator/Makefile +@@ -132,5 +132,5 @@ + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) ++ @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) diff --git a/media-libs/libjsw/libjsw-1.5.5.ebuild b/media-libs/libjsw/libjsw-1.5.5.ebuild index 116084515ec3..ecd14b05fb50 100644 --- a/media-libs/libjsw/libjsw-1.5.5.ebuild +++ b/media-libs/libjsw/libjsw-1.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.5.ebuild,v 1.4 2005/05/23 15:46:22 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.5.ebuild,v 1.5 2005/06/03 00:49:16 vapier Exp $ inherit eutils @@ -22,6 +22,7 @@ src_unpack() { bunzip2 libjsw/man/* jscalibrator/jscalibrator.1.bz2 || die "bunzip failed" cd jscalibrator epatch "${FILESDIR}"/${P}-gcc33.patch + epatch "${FILESDIR}"/${P}-liborder.patch } src_compile() { |