summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-10-09 09:31:21 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-10-09 09:31:21 +0000
commit61bb54b22b68c4ee8b83da22dc1a90e3779d19fc (patch)
treea861f257c902e0a0107249403874d24461456ef3 /media-libs
parentRemove pointless keepdir. (diff)
downloadgentoo-2-61bb54b22b68c4ee8b83da22dc1a90e3779d19fc.tar.gz
gentoo-2-61bb54b22b68c4ee8b83da22dc1a90e3779d19fc.tar.bz2
gentoo-2-61bb54b22b68c4ee8b83da22dc1a90e3779d19fc.zip
Respect LDFLAGS wrt #285541, thanks to Davide Pesavento for reporting.
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/jpeg-compat/ChangeLog6
-rw-r--r--media-libs/jpeg-compat/files/jpeg-compat-6b-ldflags.patch12
-rw-r--r--media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/media-libs/jpeg-compat/ChangeLog b/media-libs/jpeg-compat/ChangeLog
index 629252e0e404..870bc4f07448 100644
--- a/media-libs/jpeg-compat/ChangeLog
+++ b/media-libs/jpeg-compat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/jpeg-compat
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-compat/ChangeLog,v 1.7 2009/10/06 22:33:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-compat/ChangeLog,v 1.8 2009/10/09 09:31:20 ssuominen Exp $
+
+ 09 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+ jpeg-compat-6b-r1.ebuild, +files/jpeg-compat-6b-ldflags.patch:
+ Respect LDFLAGS wrt #285541, thanks to Davide Pesavento for reporting.
06 Oct 2009; Markus Meier <maekke@gentoo.org> jpeg-compat-6b-r1.ebuild:
x86 stable
diff --git a/media-libs/jpeg-compat/files/jpeg-compat-6b-ldflags.patch b/media-libs/jpeg-compat/files/jpeg-compat-6b-ldflags.patch
new file mode 100644
index 000000000000..d3693ec32440
--- /dev/null
+++ b/media-libs/jpeg-compat/files/jpeg-compat-6b-ldflags.patch
@@ -0,0 +1,12 @@
+diff -ur jpeg-6b.orig/ltconfig jpeg-6b/ltconfig
+--- jpeg-6b.orig/ltconfig 1998-03-25 17:25:39.000000000 +0200
++++ jpeg-6b/ltconfig 2009-10-09 12:28:17.000000000 +0300
+@@ -716,7 +716,7 @@
+
+ # See if GNU ld supports shared libraries.
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
++ archive_cmds='$CC $LDFLAGS -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+ runpath_var=LD_RUN_PATH
+ ld_shlibs=yes
+ else
diff --git a/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild b/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild
index ae3521517699..66b2bc944396 100644
--- a/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild
+++ b/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild,v 1.5 2009/10/06 22:33:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild,v 1.6 2009/10/09 09:31:20 ssuominen Exp $
EAPI=2
inherit eutils libtool multilib toolchain-funcs
@@ -35,6 +35,7 @@ pkg_setup() {
src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+ epatch "${FILESDIR}"/${P}-ldflags.patch
rm libtool-wrap
ln -s libtool libtool-wrap
elibtoolize