components/imagemagick/patches/la.patch
author Stacy Yeh <stacy.yeh@oracle.com>
Wed, 16 Sep 2015 10:55:26 -0700
changeset 4869 86742f9e20a9
parent 3798 c0f7a9f723ca
child 6020 83b3789e8d88
permissions -rw-r--r--
20530770 ImageMagick "gmake test" failures

To avoid dependency on libtool/libltdl, change "*.la" extension to "*.so".
This also changes the path for the *.so files necessary for testing to the 
correct location.
This patch comes from in-house.  It has not been submitted upstream; plans
unclear.

--- ImageMagick-6.8.3/magick/module.c.~1~	2012-12-07 05:14:16.000000000 -0800
+++ ImageMagick-6.8.3/magick/module.c	2015-02-10 20:31:54.595614457 -0800
@@ -72,7 +72,7 @@
   Define declarations.
 */
 #if defined(MAGICKCORE_LTDL_DELEGATE)
-#  define ModuleGlobExpression "*.la"
+#  define ModuleGlobExpression "*.so"
 #else
 #  if defined(_DEBUG)
 #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
@@ -1453,7 +1453,7 @@
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
   assert(name != (char *) NULL);
 #if defined(MAGICKCORE_LTDL_DELEGATE)
-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
+  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
   (void) LocaleLower(name);
 #else
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
@@ -1504,7 +1504,7 @@
 #if !defined(MAGICKCORE_LTDL_DELEGATE)
   (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
 #else
-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
+  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
 #endif
 }
 
--- ImageMagick-6.8.3/common.shi.in	Sun Dec 30 08:09:07 2012
+++ ImageMagick-6.8.3/common.shi.in	Tue Sep 15 15:29:31 2015
@@ -14,8 +14,8 @@
 DRAWTEST="@abs_top_builddir@/tests/drawtest"
 WANDTEST="@abs_top_builddir@/tests/wandtest"
 LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}"
-MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders"
+MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders/.libs"
 MAGICK_CONFIGURE_PATH="@abs_top_builddir@/config:@abs_top_srcdir@/config"
-MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters"
+MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters/.libs"
 PATH="@abs_top_builddir@/utilities:@abs_top_builddir@/tests:${PATH}"
 set +a