| author | John Beck <John.Beck@Oracle.COM> |
| Fri, 29 Jul 2016 06:17:40 -0700 | |
| branch | s11u3-sru |
| changeset 6539 | 87c707918565 |
| parent 6072 | a1b208a8235a |
| permissions | -rw-r--r-- |
|
6072
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
Override Solaris-specific settings => not for upstream. |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
--- ImageMagick-6.9.4/PerlMagick/Makefile.PL.in.~1~ 2016-05-09 10:28:57.000000000 -0700 |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ ImageMagick-6.9.4/PerlMagick/Makefile.PL.in 2016-05-10 14:46:18.533378790 -0700 |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -214,6 +214,8 @@ |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
# C compiler flags (e.g. -O -g) |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
'CCFLAGS' => $CCFLAGS_magick, |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
+ 'CCCDLFLAGS' => '-fPIC', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
+ |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
# Linker |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
#'LD' => $Config{'ld'} == $Config{'cc'} ? '@CC@' : $Config{'ld'},
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
@@ -232,8 +234,7 @@ |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
# Perl binary name (if a Perl binary is built) |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
'MAP_TARGET' => 'PerlMagick', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
- # Let CFLAGS drive optimization flags by setting OPTIMIZE to empty |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
- # 'OPTIMIZE' => '', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
+ 'OPTIMIZE' => '-O3', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
# Use same compiler as ImageMagick |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
--- ImageMagick-6.9.4/PerlMagick/quantum/Makefile.PL.in.~1~ 2016-05-09 10:28:57.000000000 -0700 |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
+++ ImageMagick-6.9.4/PerlMagick/quantum/Makefile.PL.in 2016-05-10 13:42:57.219875745 -0700 |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
26 |
@@ -211,6 +211,8 @@ |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
27 |
# C compiler flags (e.g. -O -g) |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
28 |
'CCFLAGS' => $CCFLAGS_magick, |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
29 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
30 |
+ 'CCCDLFLAGS' => '-fPIC', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
31 |
+ |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
32 |
# Linker |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
33 |
#'LD' => $Config{'ld'} == $Config{'cc'} ? '@CC@' : $Config{'ld'},
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
34 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
35 |
@@ -229,8 +231,7 @@ |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
36 |
# Perl binary name (if a Perl binary is built) |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
37 |
'MAP_TARGET' => 'PerlMagick', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
38 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
39 |
- # Let CFLAGS drive optimization flags by setting OPTIMIZE to empty |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
40 |
- # 'OPTIMIZE' => '', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
41 |
+ 'OPTIMIZE' => '-O3', |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
42 |
|
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
43 |
# Use same compiler as ImageMagick |
|
a1b208a8235a
23278701 Upgrade ImageMagick to 6.9.4
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
44 |
'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', |