diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-13 17:17:14 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-13 17:17:14 +0200 |
| commit | b448bbcdab09b70b4d03ea0bc9167878e7f054da (patch) | |
| tree | 40ea72e4979ce176f6280b25368713122bee1b9c /package/jpeg/patches | |
| parent | d804be5baee6590ff6e91d267c8cb9933ed7ac60 (diff) | |
| parent | d2e5a673aa7637c990ca7307e831327eb67e3fe7 (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
Diffstat (limited to 'package/jpeg/patches')
| -rw-r--r-- | package/jpeg/patches/jpeg-6b-fix-makefile.patch | 6 | ||||
| -rw-r--r-- | package/jpeg/patches/patch-configure | 8 | ||||
| -rw-r--r-- | package/jpeg/patches/patch-ltconfig | 12 |
3 files changed, 23 insertions, 3 deletions
diff --git a/package/jpeg/patches/jpeg-6b-fix-makefile.patch b/package/jpeg/patches/jpeg-6b-fix-makefile.patch index 7e4c8d3ed..057e576c4 100644 --- a/package/jpeg/patches/jpeg-6b-fix-makefile.patch +++ b/package/jpeg/patches/jpeg-6b-fix-makefile.patch @@ -1,7 +1,7 @@ diff -ruN jpeg-6b-old/makefile.cfg jpeg-6b/makefile.cfg ---- jpeg-6b-old/makefile.cfg 2006-11-02 12:36:36.000000000 +0100 -+++ jpeg-6b/makefile.cfg 2006-11-02 12:37:09.000000000 +0100 -@@ -168,7 +168,7 @@ +--- jpeg-6b.orig/makefile.cfg 1998-03-21 20:08:57.000000000 +0100 ++++ jpeg-6b/makefile.cfg 2009-06-12 17:58:24.000000000 +0200 +@@ -168,7 +168,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS) # with libtool: libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS) diff --git a/package/jpeg/patches/patch-configure b/package/jpeg/patches/patch-configure new file mode 100644 index 000000000..3a624b34d --- /dev/null +++ b/package/jpeg/patches/patch-configure @@ -0,0 +1,8 @@ +--- jpeg-6b.orig/configure 1998-03-21 20:08:57.000000000 +0100 ++++ jpeg-6b/configure 2009-06-12 18:04:41.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/sh -x + + # Guess values for system-dependent variables and create Makefiles. + # Generated automatically using autoconf version 2.12 diff --git a/package/jpeg/patches/patch-ltconfig b/package/jpeg/patches/patch-ltconfig new file mode 100644 index 000000000..dd6127a63 --- /dev/null +++ b/package/jpeg/patches/patch-ltconfig @@ -0,0 +1,12 @@ +--- jpeg-6b.orig/ltconfig 1998-03-25 16:25:39.000000000 +0100 ++++ jpeg-6b/ltconfig 2009-06-12 18:17:05.000000000 +0200 +@@ -1104,7 +1104,8 @@ finish_cmds= + finish_eval= + shlibpath_var= + version_type=none +-dynamic_linker="$host_os ld.so" ++dynamic_linker="Linux ld.so" ++host_os=linux-gnu + + echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6 + case "$host_os" in |