| author | John Beck <John.Beck@Oracle.COM> |
| Thu, 12 Feb 2015 08:27:28 -0800 | |
| changeset 3798 | c0f7a9f723ca |
| parent 1255 | b7b09f9348b7 |
| child 6020 | 83b3789e8d88 |
| 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 |
This patch is Solaris-specific and thus will not be contributed upstream. |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
2 |
|
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
3 |
--- ImageMagick-6.8.3/PerlMagick/Makefile.am.~1~ 2013-02-13 15:22:54.000000000 -0800 |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
4 |
+++ ImageMagick-6.8.3/PerlMagick/Makefile.am 2015-02-10 20:35:39.222565738 -0800 |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
5 |
@@ -59,7 +59,7 @@ |
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
6 |
|
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
7 |
install-exec-perl: $(PERLMAKEFILE) |
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
8 |
( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
9 |
- $(MAKE) CC='@CC@' install ) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
10 |
+ $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
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:
950
diff
changeset
|
12 |
all-perl: perl-sources |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
13 |
|
|
3798
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
14 |
@@ -67,7 +67,8 @@ |
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
15 |
echo "Uninstall not supported for PerlMagick" |
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
16 |
|
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
17 |
check-perl: $(PERLMAKEFILE) |
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
18 |
- cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
19 |
+ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh \ |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
20 |
+ $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
21 |
|
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
22 |
perl-build: $(PERLMAKEFILE) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
23 |
( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |
|
3798
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
24 |
--- ImageMagick-6.8.3/Makefile.in.~1~ 2013-02-25 00:55:13.000000000 -0800 |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
25 |
+++ ImageMagick-6.8.3/Makefile.in 2015-02-10 20:37:32.843393109 -0800 |
|
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
26 |
@@ -10472,7 +10472,7 @@ |
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
27 |
|
|
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
28 |
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) |
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
29 |
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
30 |
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' install ) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
31 |
+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
32 |
|
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
33 |
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources |
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
34 |
|
|
3798
c0f7a9f723ca
20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents:
1255
diff
changeset
|
35 |
@@ -10480,7 +10480,7 @@ |
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
36 |
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ echo "Uninstall not supported for PerlMagick" |
|
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
37 |
|
|
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
38 |
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE) |
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
39 |
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
40 |
+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
|
950
cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
41 |
|
|
1255
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
42 |
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@perl-build: $(PERLMAKEFILE) |
|
b7b09f9348b7
15800374 SUNBT7179521 ImageMagick 6.3.4 convert no longer supports conversions from xwd
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
950
diff
changeset
|
43 |
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |