Lines 1-6
Link Here
|
1 |
--- Makefile.PL 2014-03-11 19:59:40.000000000 -0300 |
1 |
--- Makefile.PL.orig 2016-02-02 23:36:13 UTC |
2 |
+++ Makefile.PL 2014-06-25 11:18:59.000000000 -0300 |
2 |
+++ Makefile.PL |
3 |
@@ -11,7 +11,7 @@ |
3 |
@@ -11,7 +11,7 @@ use Config; |
4 |
|
4 |
|
5 |
sub MY::postamble { |
5 |
sub MY::postamble { |
6 |
my $out=""; |
6 |
my $out=""; |
Lines 8-15
Link Here
|
8 |
+ # Note OPTIMIZE is passed from upper gmakefile, so this code needed there too. |
8 |
+ # Note OPTIMIZE is passed from upper gmakefile, so this code needed there too. |
9 |
# -O2 optimization seems unreasonably slow on nearly every platform. I give up. |
9 |
# -O2 optimization seems unreasonably slow on nearly every platform. I give up. |
10 |
my $optimize = $Config{optimize}; $optimize =~ s/(^| )-O2( |$)/\1-O\2/g; |
10 |
my $optimize = $Config{optimize}; $optimize =~ s/(^| )-O2( |$)/\1-O\2/g; |
11 |
$out .= "OPTIMIZE = $optimize\n"; |
11 |
# pass hardening flags |
12 |
@@ -82,6 +82,8 @@ |
12 |
@@ -86,6 +86,8 @@ cppcheck: $(CPPCHECK_DEP) |
13 |
return $out; |
13 |
return $out; |
14 |
} |
14 |
} |
15 |
|
15 |
|
Lines 18-33
Link Here
|
18 |
my $fail; |
18 |
my $fail; |
19 |
local $! = undef; |
19 |
local $! = undef; |
20 |
my $have_gen = -d "Preproc/gen"; |
20 |
my $have_gen = -d "Preproc/gen"; |
21 |
@@ -93,7 +95,7 @@ |
21 |
@@ -97,7 +99,7 @@ my $have_gen = -d "Preproc/gen"; |
22 |
if ($have_gen) { warn "\n-Note: 'bison' must be installed to build from sources\n"; } |
22 |
if ($have_gen) { warn "\n-Note: 'bison' must be installed to build from sources\n"; } |
23 |
else { $fail=1; warn "\n%Error: 'bison' must be installed to build\n\n"; } |
23 |
else { $fail=1; warn "\n%Error: 'bison' must be installed to build\n\n"; } |
24 |
} |
24 |
} |
25 |
-`g++ --version`; if ($?) { $fail=1; warn "\n%Error: 'gcc/g++' must be installed to build\n"; } |
25 |
-`g++ --version`; if ($?) { $fail=1; warn "\n%Error: 'gcc/g++' must be installed to build\n"; } |
26 |
+system("$CXX --version"); if ($?) { $fail=1; warn "\n%Error: 'gcc/g++' must be installed to build\n"; } |
26 |
+system("$CXX --version"); if ($?) { $fail=1; warn "\n%Error: 'clang' must be installed to build\n"; } |
27 |
if ($fail) { |
27 |
if ($fail) { |
28 |
if ($ENV{AUTOMATED_TESTING}) { |
28 |
if ($ENV{AUTOMATED_TESTING}) { |
29 |
exit(0); |
29 |
exit(0); |
30 |
@@ -135,8 +137,8 @@ |
30 |
@@ -139,7 +141,7 @@ WriteMakefile( |
31 |
}, |
31 |
}, |
32 |
); |
32 |
); |
33 |
|
33 |
|
Lines 36-39
Link Here
|
36 |
if ($? || $mkv !~ /GNU Make/i) { |
36 |
if ($? || $mkv !~ /GNU Make/i) { |
37 |
warn "-Important: Now type 'gmake MAKE=gmake' as this package requires GNU Make\n"; |
37 |
warn "-Important: Now type 'gmake MAKE=gmake' as this package requires GNU Make\n"; |
38 |
} |
38 |
} |
39 |
1; |
|
|