author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Fri, 30 Sep 2016 21:33:56 -0700 | |
changeset 7017 | 25872950aa80 |
parent 6183 | f1a79541c99d |
permissions | -rw-r--r-- |
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". |
4869
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
2 |
This also changes the path for the *.so files necessary for testing to the |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
3 |
correct location. |
3798
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
4 |
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
|
5 |
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
|
6 |
|
6020
83b3789e8d88
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
4869
diff
changeset
|
7 |
--- ImageMagick-6.9.4/magick/module.c.~1~ 2016-05-09 10:28:58.000000000 -0700 |
83b3789e8d88
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
4869
diff
changeset
|
8 |
+++ ImageMagick-6.9.4/magick/module.c 2016-05-10 08:56:44.350751083 -0700 |
83b3789e8d88
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
4869
diff
changeset
|
9 |
@@ -74,7 +74,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
|
10 |
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
|
11 |
*/ |
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 |
#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
|
13 |
-# 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
|
14 |
+# 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
|
15 |
#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
|
16 |
# 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
|
17 |
# define ModuleGlobExpression "IM_MOD_DB_*.dll" |
6183
f1a79541c99d
23586894 Upgrade ImageMagick to 6.9.4-9
John Beck <John.Beck@Oracle.COM>
parents:
6020
diff
changeset
|
18 |
@@ -1482,7 +1482,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
|
19 |
(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
|
20 |
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
|
21 |
#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
|
22 |
- (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
|
23 |
+ (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
|
24 |
(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
|
25 |
#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
|
26 |
#if defined(MAGICKCORE_WINDOWS_SUPPORT) |
6183
f1a79541c99d
23586894 Upgrade ImageMagick to 6.9.4-9
John Beck <John.Beck@Oracle.COM>
parents:
6020
diff
changeset
|
27 |
@@ -1533,7 +1533,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
|
28 |
#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
|
29 |
(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
|
30 |
#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
|
31 |
- (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
|
32 |
+ (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
|
33 |
#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
|
34 |
} |
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
|
35 |
|
4869
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
36 |
--- ImageMagick-6.8.3/common.shi.in Sun Dec 30 08:09:07 2012 |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
37 |
+++ ImageMagick-6.8.3/common.shi.in Tue Sep 15 15:29:31 2015 |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
38 |
@@ -14,8 +14,8 @@ |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
39 |
DRAWTEST="@abs_top_builddir@/tests/drawtest" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
40 |
WANDTEST="@abs_top_builddir@/tests/wandtest" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
41 |
LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
42 |
-MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
43 |
+MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders/.libs" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
44 |
MAGICK_CONFIGURE_PATH="@abs_top_builddir@/config:@abs_top_srcdir@/config" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
45 |
-MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
46 |
+MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters/.libs" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
47 |
PATH="@abs_top_builddir@/utilities:@abs_top_builddir@/tests:${PATH}" |
86742f9e20a9
20530770 ImageMagick "gmake test" failures
Stacy Yeh <stacy.yeh@oracle.com>
parents:
3798
diff
changeset
|
48 |
set +a |