OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Apr-2008 09:47:39
Branch: HEAD Handle: 2008040308473800
Modified files:
openpkg-src/js js.patch js.spec
Log:
fix building Perl modules
Summary:
Revision Changes Path
1.20 +33 -3 openpkg-src/js/js.patch
1.67 +1 -1 openpkg-src/js/js.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 js.patch
--- openpkg-src/js/js.patch 2 Apr 2008 08:13:16 -0000 1.19
+++ openpkg-src/js/js.patch 3 Apr 2008 07:47:38 -0000 1.20
@@ -1,6 +1,15 @@
Index: JavaScript-1.05/Makefile.PL
--- JavaScript-1.05/Makefile.PL.orig 2008-03-27 17:08:05 +0100
-+++ JavaScript-1.05/Makefile.PL 2008-04-02 09:43:36 +0200
++++ JavaScript-1.05/Makefile.PL 2008-04-03 09:36:31 +0200
+@@ -92,7 +92,7 @@
+ # Override with $ENV{JS_LIB} and $ENV{JS_INC}
+ if (exists $ENV{JS_LIB}) {
+ @libs = get_paths($ENV{JS_LIB});
+- $lib = "js";
++ $lib = "js -lm";
+ }
+ if (exists $ENV{JS_INC}) {
+ @incs = get_paths($ENV{JS_INC});
@@ -107,7 +107,7 @@
push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE};
}
@@ -28,9 +37,30 @@
if ($enable_e4x eq "y") {
push @extra_headers, "jsxml";
push @defines, "JS_ENABLE_E4X";
+@@ -164,7 +164,7 @@
+ END_OF_SOURCE
+ close $test_script;
+ my $exe = tmpnam();
+-system($Config{cc}, $libs, @ccflags, "-l${lib}", "-o", $exe, (map { "-I$_"
} @incs), "test_js.c");
++system($Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o", $exe,
"test_js.c", $libs, split(/\s+/, "-l${lib}"));
+ if ($?) {
+ print "Failed compiling test_js.c. ABORTING\n";
+ exit 1;
+@@ -174,11 +174,6 @@
+ # Get js version and require 1.7 or later
+ my ($engine, $version, $date) = split/\s+/, qx($exe);
+ my ($v2) = $version =~ /^(\d+\.\d+)/;
+-if ($v2 < 1.7) {
+- if (prompt("I require SpiderMonkey version 1.7 or later but found
${version}. Try anyways? [y/N]", "N") ne "y") {
+- exit 1;
+- }
+-}
+
+ # Dispose temp stuff
+ unlink($exe);
Index: JavaScript-SpiderMonkey-0.19/Makefile.PL
--- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig 2007-06-08 21:03:08
+0200
-+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-04-02 09:16:35 +0200
++++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-04-03 09:36:11 +0200
@@ -31,6 +31,7 @@
);
@@ -49,7 +79,7 @@
($] >= 5.005 ? ## Add these new keywords supported since 5.005
Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm
--- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig 2007-09-05
14:00:17 +0200
-+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-04-02 09:16:35
+0200
++++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-04-03 09:36:11
+0200
@@ -75,7 +75,6 @@
use strict;
use warnings;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.spec
============================================================================
$ cvs diff -u -r1.66 -r1.67 js.spec
--- openpkg-src/js/js.spec 2 Apr 2008 08:13:16 -0000 1.66
+++ openpkg-src/js/js.spec 3 Apr 2008 07:47:38 -0000 1.67
@@ -42,7 +42,7 @@
Group: Language
License: MPL/GPL/LGPL
Version: %{V_js}
-Release: 20080402
+Release: 20080403
# package options
%option with_file yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
