components/imagemagick/patches/la.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 14 May 2015 09:33:42 -0700
changeset 4291 402cc6853ea3
parent 3798 c0f7a9f723ca
child 4869 86742f9e20a9
permissions -rw-r--r--
19866378 Can enable gmake check in libdnet when check is checked in
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3798
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 1255
diff changeset
     1
To avoid dependency on libtool/libltdl, change "*.la" extension to "*.so".
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 1255
diff changeset
     2
This patch comes from in-house.  It has not been submitted upstream; plans
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 1255
diff changeset
     3
unclear.
1255
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
     4
3798
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 1255
diff changeset
     5
--- ImageMagick-6.8.3/magick/module.c.~1~	2012-12-07 05:14:16.000000000 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 1255
diff changeset
     6
+++ ImageMagick-6.8.3/magick/module.c	2015-02-10 20:31:54.595614457 -0800
1255
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
     7
@@ -72,7 +72,7 @@
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
     8
   Define declarations.
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
     9
 */
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    10
 #if defined(MAGICKCORE_LTDL_DELEGATE)
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    11
-#  define ModuleGlobExpression "*.la"
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    12
+#  define ModuleGlobExpression "*.so"
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    13
 #else
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    14
 #  if defined(_DEBUG)
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    15
 #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
3798
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 1255
diff changeset
    16
@@ -1453,7 +1453,7 @@
1255
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    17
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    18
   assert(name != (char *) NULL);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    19
 #if defined(MAGICKCORE_LTDL_DELEGATE)
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    20
-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    21
+  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    22
   (void) LocaleLower(name);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    23
 #else
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    24
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
3798
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 1255
diff changeset
    25
@@ -1504,7 +1504,7 @@
1255
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    26
 #if !defined(MAGICKCORE_LTDL_DELEGATE)
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    27
   (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    28
 #else
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    29
-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    30
+  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    31
 #endif
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    32
 }
b7b09f9348b7 15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents: 168
diff changeset
    33