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: 23-Jul-2006 14:39:31
Branch: HEAD Handle: 2006072313393100
Modified files:
openpkg-src/js js.patch js.spec
Removed files:
openpkg-src/js js.pc
Log:
finally switch to OSSP js, a brand-new stand-alone distribution of the
Mozilla JavaScript engine
Summary:
Revision Changes Path
1.8 +10 -178 openpkg-src/js/js.patch
1.4 +0 -10 openpkg-src/js/js.pc
1.17 +41 -68 openpkg-src/js/js.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 js.patch
--- openpkg-src/js/js.patch 29 Jun 2006 17:36:18 -0000 1.7
+++ openpkg-src/js/js.patch 23 Jul 2006 12:39:31 -0000 1.8
@@ -47,8 +47,16 @@
WriteMakefile(
'NAME' => 'JavaScript',
Index: JavaScript-SpiderMonkey-0.16/Makefile.PL
---- JavaScript-SpiderMonkey-0.16/Makefile.PL.orig 2006-06-13 13:59:05
+0200
-+++ JavaScript-SpiderMonkey-0.16/Makefile.PL 2006-06-29 19:20:44 +0200
+--- JavaScript-SpiderMonkey-0.16/Makefile.PL.orig 2006-07-22 22:49:27
+0200
++++ JavaScript-SpiderMonkey-0.16/Makefile.PL 2006-07-22 22:51:30 +0200
+@@ -27,6 +27,7 @@
+ );
+
+ my %possible_install_paths = (
++ "../js/.libs" => "../js/src",
+ "../js/src/*" => "../js/src",
+ "/usr/lib" => "/usr/include",
+ "/usr/local/lib" => "/usr/local/include",
@@ -108,7 +108,6 @@
'NAME' => 'JavaScript::SpiderMonkey',
'VERSION_FROM' => 'SpiderMonkey.pm', # finds $VERSION
@@ -84,179 +92,3 @@
}
1;
-Index: js/src/config.mk
---- js/src/config.mk.orig 2003-11-15 01:10:55 +0100
-+++ js/src/config.mk 2006-06-29 19:20:44 +0200
-@@ -114,7 +114,7 @@
-
- ifdef BUILD_OPT
- OPTIMIZER = -O
--DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
-+DEFINES += -UDEBUG -DNDEBUG
- OBJDIR_TAG = _OPT
- else
- ifdef USE_MSVC
-@@ -122,7 +122,7 @@
- else
- OPTIMIZER = -g
- endif
--DEFINES += -DDEBUG -DDEBUG_$(shell whoami)
-+DEFINES += -DDEBUG
- OBJDIR_TAG = _DBG
- endif
-
-Index: js/src/config/SunOS5.10_i86pc.mk
---- /dev/null 2006-06-29 19:26:24 +0200
-+++ js/src/config/SunOS5.10_i86pc.mk 2006-06-29 19:20:44 +0200
-@@ -0,0 +1,16 @@
-+
-+CC = gcc
-+LD = ld
-+CCC = g++
-+CFLAGS += -Wall -Wno-format
-+MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
-+RANLIB = echo
-+CPU_ARCH = $(shell uname -m)
-+GFX_ARCH = x
-+OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS -DHAVE_LOCALTIME_R
-DHAVE_VA_COPY -DVA_COPY=va_copy -DPIC -fPIC
-+OS_LIBS = -lsocket -lnsl -ldl
-+LDFLAGS =
-+NOSUCHFILE = /solaris-rm-f-sucks
-+JS_EDITLINE = 1
-+OS_TEST = i86pc
-+
-Index: js/src/jsapi.c
---- js/src/jsapi.c.orig 2006-06-16 04:01:22 +0200
-+++ js/src/jsapi.c 2006-06-29 19:20:44 +0200
-@@ -130,7 +130,7 @@
-
- static JSBool
- TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS,
-- jsval **vpp, va_list *app)
-+ jsval **vpp, va_list app)
- {
- const char *format;
- JSArgumentFormatMap *map;
-@@ -259,8 +259,7 @@
- break;
- default:
- format--;
-- if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp,
-- JS_ADDRESSOF_VA_LIST(ap))) {
-+ if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp, ap)) {
- return JS_FALSE;
- }
- /* NB: the formatter already updated sp, so we continue here. */
-@@ -362,8 +361,7 @@
- break;
- default:
- format--;
-- if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp,
-- JS_ADDRESSOF_VA_LIST(ap))) {
-+ if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp, ap)) {
- goto bad;
- }
- /* NB: the formatter already updated sp, so we continue here. */
-Index: js/src/jsdtoa.c
---- js/src/jsdtoa.c.orig 2005-07-23 23:17:40 +0200
-+++ js/src/jsdtoa.c 2006-06-29 19:20:44 +0200
-@@ -247,7 +247,7 @@
- #define word1(x) JSDOUBLE_LO32(x)
- #define set_word1(x, y) JSDOUBLE_SET_LO32(x, y)
-
--#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | (c) & 0xffff)
-+#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | ((c) & 0xffff))
-
- /* #define P DBL_MANT_DIG */
- /* Ten_pmax = floor(P*log(2)/log(5)) */
-@@ -1826,6 +1826,7 @@
- }
- #ifdef Avoid_Underflow
- if (scale) {
-+ rv0 = 0.; /* calm the compiler warning */
- set_word0(rv0, Exp_1 - P*Exp_msk1);
- set_word1(rv0, 0);
- if ((word0(rv) & Exp_mask) <= P*Exp_msk1
-Index: js/src/jsinterp.c
---- js/src/jsinterp.c.orig 2006-06-16 03:28:02 +0200
-+++ js/src/jsinterp.c 2006-06-29 19:24:50 +0200
-@@ -1740,12 +1740,12 @@
- void *mark;
- jsbytecode *endpc, *pc2;
- JSOp op, op2;
-- const JSCodeSpec *cs;
-+ const JSCodeSpec *cs = NULL;
- jsatomid atomIndex;
- JSAtom *atom;
- uintN argc, slot, attrs;
- jsval *vp, lval, rval, ltmp, rtmp;
-- jsid id;
-+ jsid id = -1L;
- JSObject *withobj, *origobj, *propobj;
- jsval iter_state;
- JSProperty *prop;
-@@ -1757,7 +1757,7 @@
- JSFunction *fun;
- JSType type;
- #ifdef DEBUG
-- FILE *tracefp;
-+ FILE *tracefp = NULL;
- #endif
- #if JS_HAS_EXPORT_IMPORT
- JSIdArray *ida;
-@@ -5526,6 +5526,7 @@
- if (printable)
- js_ReportIsNotDefined(cx, printable);
- ok = JS_FALSE;
-+ sp = NULL;
- goto out;
- }
- }
-Index: js/src/jsosdep.h
---- js/src/jsosdep.h.orig 2005-07-08 00:35:39 +0200
-+++ js/src/jsosdep.h 2006-06-29 19:20:44 +0200
-@@ -86,7 +86,7 @@
- #elif defined(SOLARIS)
- #define JS_HAVE_LONG_LONG
-
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(__FreeBSD__)
- #define JS_HAVE_LONG_LONG
-
- #elif defined(SUNOS4)
-Index: js/src/jspubtd.h
---- js/src/jspubtd.h.orig 2005-10-22 01:30:23 +0200
-+++ js/src/jspubtd.h 2006-06-29 19:20:44 +0200
-@@ -561,7 +561,7 @@
- typedef JSBool
- (* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
- JSBool fromJS, jsval **vpp,
-- va_list *app);
-+ va_list app);
- #endif
-
- typedef JSBool
-Index: js/src/perlconnect/JS.xs
---- js/src/perlconnect/JS.xs.orig 2005-11-25 09:16:37 +0100
-+++ js/src/perlconnect/JS.xs 2006-06-29 19:20:44 +0200
-@@ -61,7 +61,7 @@
-
- #include <jsapi.h>
- #include "jsperlpvt.h"
--#include <malloc.h>
-+#include <stdlib.h>
-
- /* __REMOVE__ */
- /* #include <stdio.h> */
-Index: js/src/rules.mk
---- js/src/rules.mk.orig 2003-11-15 01:11:04 +0100
-+++ js/src/rules.mk 2006-06-29 19:20:44 +0200
-@@ -58,7 +58,7 @@
- # TARGETS = $(LIBRARY) # $(PROGRAM) not supported for MSVC yet
- TARGETS += $(SHARED_LIBRARY) $(PROGRAM) # it is now
- else
--TARGETS += $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM)
-+TARGETS += $(LIBRARY) $(PROGRAM)
- endif
-
- all:
@@ .
rm -f openpkg-src/js/js.pc <<'@@ .'
Index: openpkg-src/js/js.pc
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 js.spec
--- openpkg-src/js/js.spec 16 Jul 2006 07:31:55 -0000 1.16
+++ openpkg-src/js/js.spec 23 Jul 2006 12:39:31 -0000 1.17
@@ -23,8 +23,7 @@
##
# package version
-%define V_js 1.6
-%define V_js_snapshot firefox-1.5.0.5
+%define V_js 1.6.20060722
%define V_javascript 0.55
%define V_javascript_spidermonkey 0.16
%define V_javascript_squish 0.05
@@ -42,19 +41,20 @@
Group: Language
License: MPL/GPL/LGPL
Version: %{V_js}
-Release: 20060716
+Release: 20060723
# package options
-%option with_perl no
+%option with_perl no
+%option with_editline no
+%option with_file no
# list of sources
-Source0:
ftp://ftp.openpkg.org/sources/CPY/mozilla/js-%{V_js}-%{V_js_snapshot}.tar.gz
+Source0: ftp://ftp.ossp.org/pkg/lib/js/js-%{V_js}.tar.gz
Source1:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-%{V_javascript}.tar.gz
Source2:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-SpiderMonkey-%{V_javascript_spidermonkey}.tar.gz
Source3:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Squish-%{V_javascript_squish}.tar.gz
Source4:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Code-%{V_javascript_code}.tar.gz
Source5:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-JSLint-%{V_javascript_jslint}.tar.gz
-Source6: js.pc
Patch0: js.patch
# build information
@@ -66,6 +66,10 @@
BuildPreReq: perl, perl-openpkg
PreReq: perl
%endif
+%if "%{with_editline}" == "yes"
+BuildPreReq: editline
+PreReq: editline
+%endif
AutoReq: no
AutoReqProv: no
@@ -75,13 +79,14 @@
Netscape-developed object scripting language used in millions of web
pages and server applications worldwide. Netscape's JavaScript is a
superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting
- language. This package also optionally provides Perl bindings.
+ language. This package is based on the OSSP js distribution of
+ Mozilla JavaScript and also optionally provides Perl bindings.
%track
prog js = {
- version = %{V_js}-%{V_js_snapshot}
- url = ftp://ftp.openpkg.org/sources/CPY/mozilla/
- regex = js-(__VER__-firefox-__VER__)\.tar\.gz
+ version = %{V_js}
+ url = ftp://ftp.ossp.org/pkg/lib/js/
+ regex = js-(__VER__)\.tar\.gz
}
prog js:JavaScript = {
version = %{V_javascript}
@@ -123,51 +128,39 @@
%if "%{with_perl}" == "yes"
%{l_prefix}/bin/perl-openpkg prepare
%endif
- ( cd js/src
- cp Makefile.ref Makefile
- case "%{l_platform -t}" in
- *-freebsd* )
- %{l_shtool} install -c -m 644 \
- -e 's;x86_64;amd64;g' \
- config/Linux_All.mk config/`uname -s``uname -r`.mk
- ;;
- sun*-sunos5.1[01] )
- cp config/SunOS5.9.mk config/`uname -s``uname -r`.mk
- ;;
- ix86*-sunos* )
- rm -f lock_SunOS.s
- ;;
- esac
- touch config/`uname -s``uname -r`.mk
- %{l_make} %{l_mflags} \
- CC="%{l_cc}" \
- XCFLAGS="%{l_cppflags} %{l_cflags -O}" \
- XLDFLAGS="%{l_ldflags}" \
- BUILD_OPT=1 \
- JS_EDITLINE=1
-
-%if "%{with_perl}" == "yes"
- # build Perl API
- objdir="`echo *.OBJ`"
- %{l_shtool} subst \
- -e "s:\\(\$inc.=.\"\\).*\\(\";\\):\\1-I../$objdir -I..\\2:g" \
- -e "s:\\(\$libpath.=.\"\\).*\\(\";\\):\\1-L../$objdir\\2:g" \
- perlconnect/Makefile.PL
- %{l_prefix}/bin/perl-openpkg -d perlconnect -A "-c" configure
- %{l_prefix}/bin/perl-openpkg -d perlconnect build
+ ( cd js-%{V_js}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ GREP="grep" \
+ ./configure \
+ --prefix=%{l_prefix} \
+%if "%{with_perl}" == "yes"
+ --with-perl=%{l_prefix}/bin/perl \
+%endif
+%if "%{with_editline}" == "yes"
+ --with-editline=%{l_prefix} \
+%endif
+%if "%{with_file}" == "yes"
+ --with-file \
%endif
+ --disable-shared
+ %{l_make} %{l_mflags}
) || exit $?
%if "%{with_perl}" == "yes"
# build add-on Perl bindings
( cd JavaScript-%{V_javascript}
- ln ../js/src/`uname -s``uname -r`_OPT.OBJ/libjs.a ../js/src/
- ln ../js/src/`uname -s``uname -r`_OPT.OBJ/jsautocfg.h ../js/src/
+ %{l_shtool} subst \
+ -e 's;-I\.\./js/src;-I../js-%{V_js}/src;' \
+ -e 's;-L\.\./js/src;-L../js-%{V_js}/.libs;' \
+ Makefile.PL
%{l_prefix}/bin/perl-openpkg configure build
- rm -f ../js/src/libjs.a
- rm -f ../js/src/jsautocfg.h
) || exit $?
( cd JavaScript-SpiderMonkey-%{V_javascript_spidermonkey}
+ %{l_shtool} subst \
+ -e 's;\.\./js/src;../js-%{V_js}/src;' \
+ -e 's;\.\./js/.libs;../js-%{V_js}/.libs;' \
+ Makefile.PL
%{l_prefix}/bin/perl-openpkg configure build
) || exit $?
( cd JavaScript-Squish-%{V_javascript_squish}
@@ -191,23 +184,8 @@
$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
# install vendor components
- ( cd js/src
- %{l_shtool} install -c -s -m 755 \
- *.OBJ/js $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 644 \
- *.OBJ/libjs.a $RPM_BUILD_ROOT%{l_prefix}/lib/
- for h in *.OBJ/jsautocfg.h jsapi.h jscompat.h \
- jslong.h jsosdep.h jsotypes.h jspubtd.h jstypes.h; do
- %{l_shtool} install -c -m 644 \
- $h $RPM_BUILD_ROOT%{l_prefix}/include/js/
- done
- %{l_shtool} install -c -m 644 \
- fdlibm/*.OBJ/libfdm.a $RPM_BUILD_ROOT%{l_prefix}/lib/libjsfdlibm.a
- %{l_shtool} install -c -m 644 \
- fdlibm/fdlibm.h $RPM_BUILD_ROOT%{l_prefix}/include/js/
-%if "%{with_perl}" == "yes"
- %{l_prefix}/bin/perl-openpkg -d perlconnect install
-%endif
+ ( cd js-%{V_js}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
%if "%{with_perl}" == "yes"
@@ -235,11 +213,6 @@
>perl-openpkg-files
%endif
- # install pkgconfig(1) file
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- -e 's;@version@;%{version};' \
- %{SOURCE js.pc} $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
-
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} `cat perl-openpkg-files` \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
