Clean up patches and applying of them.

diff --git a/package/libpng/libdir-la.patch b/package/libpng/libdir-la.patch
deleted file mode 100644 (file)
index d2bce4a..0000000
--- a/package/libpng/libdir-la.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- libpng-1.2.12/ltmain.sh.orig       2006-06-05 09:12:42.000000000 -0600
-+++ libpng-1.2.12/ltmain.sh    2007-01-13 14:39:14.000000000 -0700
-@@ -322,8 +322,9 @@
-       # line option must be used.
-       if test -z "$tagname"; then
-         $echo "$modename: unable to infer tagged configuration"
--        $echo "$modename: specify a tag with \`--tag'" 1>&2
--        exit $EXIT_FAILURE
-+        $echo "$modename: defaulting to \`CC'"
-+        $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#       exit $EXIT_FAILURE
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
-       fi
-@@ -2453,8 +2454,14 @@
-           absdir="$abs_ladir"
-           libdir="$abs_ladir"
-         else
--          dir="$libdir"
--          absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+          dir="$abs_ladir"
-+          absdir="$abs_ladir"
-+          libdir="$abs_ladir"
-+          #dir="$libdir"
-+          #absdir="$libdir"
-         fi
-         test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-       else
-@@ -2935,6 +2942,16 @@
-               esac
-               if grep "^installed=no" $deplib > /dev/null; then
-                 path="$absdir/$objdir"
-+#             This interferes with crosscompilation. -CL
-+#             else
-+#               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+#               if test -z "$libdir"; then
-+#                 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+#                 exit 1
-+#               fi
-+#               if test "$absdir" != "$libdir"; then
-+#                 $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+#               fi
-               else
-                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-                 if test -z "$libdir"; then
-@@ -5659,6 +5676,10 @@
-           # Replace all uninstalled libtool libraries with the installed ones
-           newdependency_libs=
-           for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
-             case $deplib in
-             *.la)
-               name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -6028,10 +6049,13 @@
-         # At present, this check doesn't affect windows .dll's that
-         # are installed into $libdir/../bin (currently, that works fine)
-         # but it's something to keep an eye on.
--        if test "$inst_prefix_dir" = "$destdir"; then
--          $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--          exit $EXIT_FAILURE
--        fi
-+        #
-+        # This breaks install into our staging area.  -PB
-+        # 
-+        # if test "$inst_prefix_dir" = "$destdir"; then
-+        #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+        #   exit $EXIT_FAILURE
-+        # fi
- 
-         if test -n "$inst_prefix_dir"; then
-           # Stick the inst_prefix_dir data into the link command.

diff --git a/package/libpng/libpng-remove-setjmp-error.patch b/package/libpng/libpng-remove-setjmp-error.patch
new file mode 100644 (file)
index 0000000..19df516
--- /dev/null
+++ b/package/libpng/libpng-remove-setjmp-error.patch
@@ -0,0 +1,17 @@
+diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
+--- libpng-1.2.16/pngconf.h    2007-01-31 07:22:33.000000000 -0600
++++ libpng-1.2.16-patched/pngconf.h    2008-02-27 17:40:23.707516659 -0600
+@@ -310,13 +310,6 @@
+ #      define PNG_SAVE_BSD_SOURCE
+ #      undef _BSD_SOURCE
+ #    endif
+-#    ifdef _SETJMP_H
+-     /* If you encounter a compiler error here, see the explanation
+-      * near the end of INSTALL.
+-      */
+-         __png.h__ already includes setjmp.h;
+-         __dont__ include it again.;
+-#    endif
+ #  endif /* __linux__ */
+ 
+    /* include setjmp.h for error handling */

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index d8478a027e0de6256c95244113d829bf02ea2545..cc82c912b39dddf43dd3043ec7a52f8ad867335d 100644 (file)
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -34,6 +34,7 @@ libpng-source: $(DL_DIR)/$(LIBPNG_SOURCE)
 
 $(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE)
        $(LIBPNG_CAT) $(DL_DIR)/$(LIBPNG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       toolchain/patch-kernel.sh $(LIBPNG_DIR) package/libpng/ libpng\*.patch
        $(CONFIG_UPDATE) $(LIBPNG_DIR)
        touch $@
 

diff --git a/package/libpng/remove-setjmp-error.patch b/package/libpng/remove-setjmp-error.patch
deleted file mode 100644 (file)
index 19df516..0000000
--- a/package/libpng/remove-setjmp-error.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
---- libpng-1.2.16/pngconf.h    2007-01-31 07:22:33.000000000 -0600
-+++ libpng-1.2.16-patched/pngconf.h    2008-02-27 17:40:23.707516659 -0600
-@@ -310,13 +310,6 @@
- #      define PNG_SAVE_BSD_SOURCE
- #      undef _BSD_SOURCE
- #    endif
--#    ifdef _SETJMP_H
--     /* If you encounter a compiler error here, see the explanation
--      * near the end of INSTALL.
--      */
--         __png.h__ already includes setjmp.h;
--         __dont__ include it again.;
--#    endif
- #  endif /* __linux__ */
- 
-    /* include setjmp.h for error handling */