diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2017-07-30 14:34:27 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2017-07-30 14:34:27 +0000 |
| commit | b56e9c435e2d6ce6f74ad0c33aee1f2089808928 (patch) | |
| tree | 33d1ae84200dc7ff10259e36b1a32d58080d6d5d /lang/p5-JavaScript-SpiderMonkey/files | |
| parent | New port: databases/grass7 (diff) | |
Move spidermonkey17's headers out of LOCALBASE and in there own subdir. [1]
This fixes build issues with other spidermonkey using ports when
SM 1.7 is installed, due to SM 1.7's headers being found first. [2]
Update SM 1.7 users to take this change into account.
PR: 219761 [1], 214724 [2], 202246 [2]
Approved by: maintainer timeout (nearly 2 months)
Notes
Notes:
svn path=/head/; revision=446936
Diffstat (limited to 'lang/p5-JavaScript-SpiderMonkey/files')
| -rw-r--r-- | lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL b/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL index ff6543e5e2bd..77fda483f1f1 100644 --- a/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL +++ b/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL @@ -1,14 +1,17 @@ ---- Makefile.PL.orig 2010-11-17 13:51:38.000000000 +0100 -+++ Makefile.PL 2010-11-17 13:59:54.000000000 +0100 -@@ -71,11 +71,6 @@ - $include_dir =~ s/$c_header$//; - push @JS_INCL_DIRS, $include_dir; - } -- foreach my $headerfile(glob "$include_path/*/$c_header") { -- my $include_dir = $headerfile; +--- Makefile.PL.orig 2011-10-23 12:27:21.000000000 +0200 ++++ Makefile.PL 2017-06-03 21:50:44.801687000 +0200 +@@ -68,13 +68,8 @@ + next if ! -f $libfile; + my $include_path = $possible_install_paths{$install_path}; + foreach my $c_header(@c_header_files) { +- if (-f "$include_path/$c_header") { ++ if (-f "$include_path/js-1.7/$c_header") { + my $include_dir = "$include_path/$c_header"; - $include_dir =~ s/$c_header$//; - push @JS_INCL_DIRS, $include_dir; - } - } - if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) { - $JS_LIB_DIR = $libfile; +- foreach my $headerfile(glob "$include_path/*/$c_header") { +- my $include_dir = $headerfile; + $include_dir =~ s/$c_header$//; + push @JS_INCL_DIRS, $include_dir; + } |