From: Luca Barbato <lu_zero@gentoo.org>
Date: Thu, 18 Nov 2004 21:27:20 +0000 (+0000)
Subject: Minor fix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa44114f74399eea99766bad3a2fdc49014c7cb5;p=gentoo.git

Minor fix
---

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index b1826f40e142..56e441e1622c 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.28 2004/11/11 00:06:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.29 2004/11/18 21:27:20 lu_zero Exp $
+
+  18 Nov 2004; Luca Barbato <lu_zero@gentoo.org> +files/jpeg-6b-pic.patch,
+  jpeg-6b-r4.ebuild:
+  Fix for bug #70947
 
 *jpeg-6b-r4 (10 Nov 2004)
 
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index c7f97760f84a..fd4fc1686498 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,4 +1,5 @@
-MD5 ace2914f510a9d68b6a9e98ebc757eff ChangeLog 3757
-MD5 49de48c1ef731ab31aec6ce73117ee3f jpeg-6b-r4.ebuild 1455
+MD5 c3a1a4bd624b4a423e8dc1c212572a5e ChangeLog 3876
 MD5 3637cbaea842b04f1aa4693a1f68e286 metadata.xml 224
+MD5 a2903869618482c418dab6572e2acb73 jpeg-6b-r4.ebuild 1491
+MD5 cd144246f6097eaa8509566385513018 files/jpeg-6b-pic.patch 537
 MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
diff --git a/media-libs/jpeg/files/jpeg-6b-pic.patch b/media-libs/jpeg/files/jpeg-6b-pic.patch
new file mode 100644
index 000000000000..a00ed79df1a9
--- /dev/null
+++ b/media-libs/jpeg/files/jpeg-6b-pic.patch
@@ -0,0 +1,12 @@
+diff -ruN jpeg-6b.orig/ltconfig jpeg-6b/ltconfig
+--- jpeg-6b.orig/ltconfig	2004-11-18 20:37:05.063778128 +0100
++++ jpeg-6b/ltconfig	2004-11-18 20:32:55.000000000 +0100
+@@ -553,7 +553,7 @@
+     # On HP-UX, both CC and GCC only warn that PIC is supported... then they
+     # create non-PIC objects.  So, if there were any warnings, we assume that
+     # PIC is not supported.
+-    if test -s conftest.err; then
++    if test -s conftest.err -a $pic_flag -eq '+Z'; then
+       echo "$ac_t"no 1>&6
+       can_build_shared=no
+       pic_flag=
diff --git a/media-libs/jpeg/jpeg-6b-r4.ebuild b/media-libs/jpeg/jpeg-6b-r4.ebuild
index d25d72d73004..b01e918469a2 100644
--- a/media-libs/jpeg/jpeg-6b-r4.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r4.ebuild,v 1.1 2004/11/11 00:06:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r4.ebuild,v 1.2 2004/11/18 21:27:20 lu_zero Exp $
 
 inherit gnuconfig flag-o-matic libtool eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	gnuconfig_update
 	uclibctoolize
 	use ppc-macos && darwintoolize
+	epatch ${FILESDIR}/${P}-pic.patch
 }
 
 src_compile() {