diff options
| author |   Karol Wojtaszek <sekretarz@gentoo.org> | 2005-01-04 18:03:21 +0000 |
|---|---|---|
| committer | Karol Wojtaszek <sekretarz@gentoo.org> | 2005-01-04 18:03:21 +0000 |
| commit | 66b547e2cd9efb4bcf246ddfd3a50f7a43ab960b (patch) | |
| tree | 96587c1138721b6d98ef8cd2702114930e588262 /media-libs/jpeg/files | |
| parent | Fixing glibc issues; bug #76626. (Manifest recommit) (diff) | |
| download | gentoo-2-66b547e2cd9efb4bcf246ddfd3a50f7a43ab960b.tar.gz gentoo-2-66b547e2cd9efb4bcf246ddfd3a50f7a43ab960b.tar.bz2 gentoo-2-66b547e2cd9efb4bcf246ddfd3a50f7a43ab960b.zip | |
Solved libtool problem on amd64 and combined with pic patch, bug #75092
Diffstat (limited to 'media-libs/jpeg/files')
| -rw-r--r-- | media-libs/jpeg/files/jpeg-6b-gentoo.patch | 24 | ||||
| -rw-r--r-- | media-libs/jpeg/files/jpeg-6b-pic.patch | 12 |
2 files changed, 24 insertions, 12 deletions
diff --git a/media-libs/jpeg/files/jpeg-6b-gentoo.patch b/media-libs/jpeg/files/jpeg-6b-gentoo.patch new file mode 100644 index 000000000000..d70e4653b693 --- /dev/null +++ b/media-libs/jpeg/files/jpeg-6b-gentoo.patch @@ -0,0 +1,24 @@ +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 +@@ -1529,7 +1529,7 @@ + + if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then + USELIBTOOL="yes" +- LIBTOOL="./libtool" ++ LIBTOOL="libtool" + 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 +@@ -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/files/jpeg-6b-pic.patch b/media-libs/jpeg/files/jpeg-6b-pic.patch deleted file mode 100644 index a00ed79df1a9..000000000000 --- a/media-libs/jpeg/files/jpeg-6b-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ -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= |