summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-09-06 06:09:02 +0000
committerMike Frysinger <vapier@gentoo.org>2005-09-06 06:09:02 +0000
commitdd3584da2aa2c668f4d2cb1532df5a9cd5c342ab (patch)
treeebe308fa753c5989431cb0545590a6145fd4f829 /media-libs/jpeg/files
parentInstall missing sb-info.el; Rework ebuild not to use GNU specific tar options. (diff)
downloadgentoo-2-dd3584da2aa2c668f4d2cb1532df5a9cd5c342ab.tar.gz
gentoo-2-dd3584da2aa2c668f4d2cb1532df5a9cd5c342ab.tar.bz2
gentoo-2-dd3584da2aa2c668f4d2cb1532df5a9cd5c342ab.zip
Cleanup build system and dont filter k6 CFLAGS anymore #104953.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-libs/jpeg/files')
-rw-r--r--media-libs/jpeg/files/jpeg-6b-gentoo.patch30
1 files changed, 24 insertions, 6 deletions
diff --git a/media-libs/jpeg/files/jpeg-6b-gentoo.patch b/media-libs/jpeg/files/jpeg-6b-gentoo.patch
index d70e4653b693..11f604b53178 100644
--- a/media-libs/jpeg/files/jpeg-6b-gentoo.patch
+++ b/media-libs/jpeg/files/jpeg-6b-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur jpeg-6b.orig/configure jpeg-6b/configure
---- jpeg-6b.orig/configure 2005-01-04 15:34:08.000000000 +0100
-+++ jpeg-6b/configure 2005-01-04 15:39:10.620128760 +0100
+--- jpeg-6b/configure
++++ jpeg-6b/configure
@@ -1529,7 +1529,7 @@
if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then
@@ -10,9 +9,8 @@ diff -Naur jpeg-6b.orig/configure jpeg-6b/configure
O="lo"
A="la"
LN='$(LIBTOOL) --mode=link $(CC)'
-diff -Naur jpeg-6b.orig/ltconfig jpeg-6b/ltconfig
---- jpeg-6b.orig/ltconfig 2005-01-04 15:41:06.025584464 +0100
-+++ jpeg-6b/ltconfig 2005-01-04 15:34:08.315086112 +0100
+--- jpeg-6b/ltconfig
++++ jpeg-6b/ltconfig
@@ -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
@@ -22,3 +20,23 @@ diff -Naur jpeg-6b.orig/ltconfig jpeg-6b/ltconfig
echo "$ac_t"no 1>&6
can_build_shared=no
pic_flag=
+--- jpeg-6b/makefile.cfg
++++ jpeg-6b/makefile.cfg
+@@ -11,13 +11,13 @@
+ # Where to install the programs and man pages.
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = $(exec_prefix)/bin
+-libdir = $(exec_prefix)/lib
+-includedir = $(prefix)/include
++bindir = @bindir@
++libdir = @libdir@
++includedir = @includedir@
+ binprefix =
+ manprefix =
+ manext = 1
+-mandir = $(prefix)/man/man$(manext)
++mandir = @mandir@/man$(manext)
+
+ # The name of your C compiler:
+ CC= @CC@