components/image/imagemagick/patches/01-la.patch

   1 To avoid dependency on libtool/libltdl, change "*.la" extension to "*.so".
   2 This also changes the path for the *.so files necessary for testing to the
   3 correct location.
   4 This patch comes from in-house.  It has not been submitted upstream; plans
   5 unclear.
   6
   7 diff -wpruN --no-dereference '--exclude=*.orig' a~/MagickCore/module.c a/MagickCore/module.c
   8 --- a~/MagickCore/module.c      1970-01-01 00:00:00
   9 +++ a/MagickCore/module.c       1970-01-01 00:00:00
  10 @@ -77,7 +77,7 @@ typedef void *ModuleHandle;
  11    Define declarations.
  12  */
  13  #if defined(MAGICKCORE_LTDL_DELEGATE)
  14 -#  define ModuleGlobExpression "*.la"
  15 +#  define ModuleGlobExpression "*.so"
  16  #else
  17  #  if defined(_DEBUG)
  18  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
  19 @@ -1473,7 +1473,7 @@ static void TagToCoderModuleName(const c
  20    if (IsEventLogging() != MagickFalse)
  21      (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
  22  #if defined(MAGICKCORE_LTDL_DELEGATE)
  23 -  (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag);
  24 +  (void) FormatLocaleString(name,MagickPathExtent,"%s.so",tag);
  25    (void) LocaleLower(name);
  26  #else
  27  #if defined(MAGICKCORE_WINDOWS_SUPPORT)
  28 @@ -1527,7 +1527,7 @@ static void TagToFilterModuleName(const
  29  #elif !defined(MAGICKCORE_LTDL_DELEGATE)
  30    (void) FormatLocaleString(name,MagickPathExtent,"%s.dll",tag);
  31  #else
  32 -  (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag);
  33 +  (void) FormatLocaleString(name,MagickPathExtent,"%s.so",tag);
  34  #endif
  35  }
  36  \f
  37 diff -wpruN --no-dereference '--exclude=*.orig' a~/common.shi.in a/common.shi.in
  38 --- a~/common.shi.in    1970-01-01 00:00:00
  39 +++ a/common.shi.in     1970-01-01 00:00:00
  40 @@ -19,9 +19,9 @@ VALIDATE="@abs_top_builddir@/tests/valid
  41  DRAWTEST="@abs_top_builddir@/tests/drawtest"
  42  WANDTEST="@abs_top_builddir@/tests/wandtest"
  43  LD_LIBRARY_PATH="@abs_top_builddir@/MagickCore/.libs:@abs_top_builddir@/MagickWand/.libs:${LD_LIBRARY_PATH}"
  44 -MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders"
  45 +MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders/.libs"
  46  MAGICK_CONFIGURE_PATH="@abs_top_builddir@/config:@abs_top_srcdir@/config"
  47 -MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters"
  48 +MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters/.libs"
  49  MAGICK_FONT="@abs_top_srcdir@/PerlMagick/demo/Generic.ttf"
  50  PATH="@abs_top_builddir@/utilities:@abs_top_builddir@/tests:${PATH}"
  51  set +a