summaryrefslogtreecommitdiff
path: root/package/ImageMagick/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/ImageMagick/patches')
-rw-r--r--package/ImageMagick/patches/patch-config_ltmain_sh30
-rw-r--r--package/ImageMagick/patches/patch-configure20
2 files changed, 30 insertions, 20 deletions
diff --git a/package/ImageMagick/patches/patch-config_ltmain_sh b/package/ImageMagick/patches/patch-config_ltmain_sh
new file mode 100644
index 000000000..3c1be111b
--- /dev/null
+++ b/package/ImageMagick/patches/patch-config_ltmain_sh
@@ -0,0 +1,30 @@
+--- ImageMagick-6.6.5-10.orig/config/ltmain.sh 2010-11-21 22:35:22.000000000 +0100
++++ ImageMagick-6.6.5-10/config/ltmain.sh 2011-01-08 23:20:33.000000000 +0100
+@@ -5843,27 +5843,6 @@ func_mode_link ()
+ esac
+ fi
+
+- # Hardcode the library path.
+- # Skip directories that are in the system default run-time
+- # search path.
+- case " $sys_lib_dlsearch_path " in
+- *" $absdir "*) ;;
+- *)
+- case "$compile_rpath " in
+- *" $absdir "*) ;;
+- *) compile_rpath="$compile_rpath $absdir"
+- esac
+- ;;
+- esac
+- case " $sys_lib_dlsearch_path " in
+- *" $libdir "*) ;;
+- *)
+- case "$finalize_rpath " in
+- *" $libdir "*) ;;
+- *) finalize_rpath="$finalize_rpath $libdir"
+- esac
+- ;;
+- esac
+ fi # $linkmode,$pass = prog,link...
+
+ if test "$alldeplibs" = yes &&
diff --git a/package/ImageMagick/patches/patch-configure b/package/ImageMagick/patches/patch-configure
deleted file mode 100644
index 717f612ea..000000000
--- a/package/ImageMagick/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- ImageMagick-6.6.5-10.orig/configure 2010-11-21 22:36:46.000000000 +0100
-+++ ImageMagick-6.6.5-10/configure 2011-01-07 00:03:54.000000000 +0100
-@@ -14824,7 +14824,7 @@ fi
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
-- hardcode_into_libs=yes
-+ hardcode_into_libs=no
-
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -18491,7 +18491,7 @@ fi
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
-- hardcode_into_libs=yes
-+ hardcode_into_libs=no
-
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"