components/imagemagick/patches/la.patch
branchs11u3-sru
changeset 6072 a1b208a8235a
parent 2721 3c9bd15584c4
child 6233 bbdba2b0d364
equal deleted inserted replaced
6056:a09718eb53b6 6072:a1b208a8235a
     1 To avoid dependency on libtool/libltdl, change "*.la" extension
     1 To avoid dependency on libtool/libltdl, change "*.la" extension
     2 to "*.so"
     2 to "*.so"
     3 -----------------------------------------------------------------
     3 -----------------------------------------------------------------
     4 
     4 
     5 --- ImageMagick-6.7.8/magick/module.c	Sun Dec 18 17:54:26 2011
     5 --- ImageMagick-6.9.4/magick/module.c.~1~	2016-05-09 10:28:58.000000000 -0700
     6 +++ ImageMagick-6.7.8/magick/module.c	Thu Oct  4 00:00:46 2012
     6 +++ ImageMagick-6.9.4/magick/module.c	2016-05-10 08:56:44.350751083 -0700
     7 @@ -72,7 +72,7 @@
     7 @@ -74,7 +74,7 @@
     8    Define declarations.
     8    Define declarations.
     9  */
     9  */
    10  #if defined(MAGICKCORE_LTDL_DELEGATE)
    10  #if defined(MAGICKCORE_LTDL_DELEGATE)
    11 -#  define ModuleGlobExpression "*.la"
    11 -#  define ModuleGlobExpression "*.la"
    12 +#  define ModuleGlobExpression "*.so"
    12 +#  define ModuleGlobExpression "*.so"
    13  #else
    13  #else
    14  #  if defined(_DEBUG)
    14  #  if defined(_DEBUG)
    15  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
    15  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
    16 @@ -1454,7 +1454,7 @@
    16 @@ -1480,7 +1480,7 @@
    17    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
    17    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
    18    assert(name != (char *) NULL);
    18    assert(name != (char *) NULL);
    19  #if defined(MAGICKCORE_LTDL_DELEGATE)
    19  #if defined(MAGICKCORE_LTDL_DELEGATE)
    20 -  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
    20 -  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
    21 +  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
    21 +  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
    22    (void) LocaleLower(name);
    22    (void) LocaleLower(name);
    23  #else
    23  #else
    24  #if defined(MAGICKCORE_WINDOWS_SUPPORT)
    24  #if defined(MAGICKCORE_WINDOWS_SUPPORT)
    25 @@ -1505,7 +1505,7 @@
    25 @@ -1531,7 +1531,7 @@
    26  #if !defined(MAGICKCORE_LTDL_DELEGATE)
    26  #if !defined(MAGICKCORE_LTDL_DELEGATE)
    27    (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
    27    (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
    28  #else
    28  #else
    29 -  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
    29 -  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
    30 +  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
    30 +  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);