RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 10-Jan-2010 01:31:20
Branch: HEAD Handle: 2010011000311901
Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/js Makefile.am tjs.c
rpm/rpmio Makefile.am rpmjs.c
Log:
- js: stub in sufficient AutoFu to build --with-gpsee=internal.
Summary:
Revision Changes Path
1.3246 +1 -0 rpm/CHANGES
2.426 +12 -0 rpm/configure.ac
2.329 +2 -1 rpm/devtool.conf
1.35 +1 -2 rpm/js/Makefile.am
1.71 +5 -0 rpm/js/tjs.c
1.264 +1 -0 rpm/rpmio/Makefile.am
1.22 +2 -2 rpm/rpmio/rpmjs.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3245 -r1.3246 CHANGES
--- rpm/CHANGES 9 Jan 2010 15:58:10 -0000 1.3245
+++ rpm/CHANGES 10 Jan 2010 00:31:19 -0000 1.3246
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: js: stub in sufficient AutoFu to build --with-gpsee=internal.
- jbj: js: prepare to use GPSEE as embedded JS interpreter.
- jbj: js: switch print method to use JS_FN (Fast Native) w/o a stack
frame.
- jbj: js: allow --with-js=/usr/lib:/usr/include/js w external
TraceMonkey.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.425 -r2.426 configure.ac
--- rpm/configure.ac 9 Jan 2010 22:03:33 -0000 2.425
+++ rpm/configure.ac 10 Jan 2010 00:31:19 -0000 2.426
@@ -1496,6 +1496,18 @@
], [])
AC_SUBST(WITH_SPIDERMONKEY_SUBDIR)
+dnl # GPSEE
+RPM_CHECK_LIB(
+ [GPSEE], [gpsee],
+ [gpsee], [gpsee_createInterpreter], [gpsee.h],
+ [no,internal:none], [gpsee],
+ [ AC_DEFINE(WITH_GPSEE, 1, [Define to 1 if to use GPSEE as the embedded
JS interpreter])
+ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
+ AC_DEFINE(HAVE_GPSEE_H, 1, [Define to 1 if you have <gpsee.h>])
+ AC_DEFINE(HAVE_LIBGPSEE, 1, [Define to 1 if you have the 'gpsee'
library (-ljs).])
+ fi
+ ], [])
+
dnl # Rc
RPM_CHECK_LIB(
[Rc], [rc],
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.328 -r2.329 devtool.conf
--- rpm/devtool.conf 6 Jan 2010 10:55:06 -0000 2.328
+++ rpm/devtool.conf 10 Jan 2010 00:31:19 -0000 2.329
@@ -106,7 +106,8 @@
--with-ficl=none \
--with-bash=internal \
--with-rc=internal \
- --with-js=internal \
+ --with-js=/usr/lib:/usr/include/js \
+ --with-gpsee=internal \
--with-python \
--with-pythonembed=/usr/lib:/usr/include/python2.6 \
--with-perl \
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
============================================================================
$ cvs diff -u -r1.34 -r1.35 Makefile.am
--- rpm/js/Makefile.am 26 Dec 2009 16:26:15 -0000 1.34
+++ rpm/js/Makefile.am 10 Jan 2010 00:31:20 -0000 1.35
@@ -16,6 +16,7 @@
@WITH_FILE_CPPFLAGS@ \
@WITH_JS_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
+ @WITH_GPSEE_CPPFLAGS@ \
@WITH_SYCK_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@
@@ -66,7 +67,6 @@
@LTLIBINTL@
noinst_HEADERS = \
- rpmjsfile.h \
rpmaug-js.h rpmbc-js.h rpmbf-js.h rpmcudf-js.h rpmdb-js.h rpmdbc-js.h
rpmdbe-js.c rpmdc-js.h rpmdig-js.h \
rpmdir-js.h rpmds-js.h rpmfc-js.h rpmfi-js.h rpmfts-js.h rpmgi-js.h \
rpmhdr-js.h rpmio-js.h rpmiob-js.h rpmmc-js.h rpmmg-js.h rpmmi-js.h \
@@ -75,7 +75,6 @@
syck-js.h uuid-js.h
librpmjsm_la_SOURCES = \
- rpmjsfile.c \
rpmaug-js.c rpmbc-js.c rpmbf-js.c rpmcudf-js.c rpmdb-js.c rpmdbc-js.c
rpmdbe-js.c rpmdc-js.c rpmdig-js.c \
rpmdir-js.c rpmds-js.c rpmfc-js.c rpmfi-js.c rpmfts-js.c rpmgi-js.c \
rpmhdr-js.c rpmio-js.c rpmiob-js.c rpmmc-js.c rpmmg-js.c rpmmi-js.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tjs.c
============================================================================
$ cvs diff -u -r1.70 -r1.71 tjs.c
--- rpm/js/tjs.c 9 Jan 2010 15:58:11 -0000 1.70
+++ rpm/js/tjs.c 10 Jan 2010 00:31:20 -0000 1.71
@@ -50,7 +50,9 @@
#include "syck-js.h"
#include "uuid-js.h"
+#ifdef DYING
#include "rpmjsfile.h"
+#endif
#include <rpmcli.h>
@@ -69,6 +71,7 @@
static int _zeal = 2;
#if defined(WITH_GPSEE)
+#define MAKEDEPEND /* XXX hack-o-round JS_THREADSAFE check */
#include <gpsee/gpsee.h>
typedef gpsee_interpreter_t * JSI_t;
#else
@@ -107,7 +110,9 @@
{ "Ds", rpmjs_InitDsClass, 13 },
{ "Fc", rpmjs_InitFcClass, 34 }, /* todo++ */
{ "Fi", rpmjs_InitFiClass, 14 },
+#ifdef DYING
{ "File", js_InitFileClass, -1 },
+#endif
{ "Fts", rpmjs_InitFtsClass, 30 },
{ "Gi", rpmjs_InitGiClass, 35 }, /* todo++ */
{ "Hdr", rpmjs_InitHdrClass, 12 },
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.263 -r1.264 Makefile.am
--- rpm/rpmio/Makefile.am 24 Dec 2009 16:23:50 -0000 1.263
+++ rpm/rpmio/Makefile.am 10 Jan 2010 00:31:20 -0000 1.264
@@ -43,6 +43,7 @@
@WITH_FILE_CPPFLAGS@ \
@WITH_JS_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
+ @WITH_GPSEE_CPPFLAGS@ \
@WITH_PCRE_CPPFLAGS@ \
@WITH_SYCK_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs.c
============================================================================
$ cvs diff -u -r1.21 -r1.22 rpmjs.c
--- rpm/rpmio/rpmjs.c 9 Jan 2010 15:58:11 -0000 1.21
+++ rpm/rpmio/rpmjs.c 10 Jan 2010 00:31:20 -0000 1.22
@@ -8,7 +8,6 @@
#endif
#include "system.h"
-#define WITH_GPSEE
#include <argv.h>
@@ -19,6 +18,7 @@
#include "jsapi.h"
#if defined(WITH_GPSEE)
+#define MAKEDEPEND /* XXX hack-o-round JS_THREADSAFE check */
#include <gpsee/gpsee.h>
typedef gpsee_interpreter_t * JSI_t;
#else
@@ -42,7 +42,7 @@
/*...@unchecked@*/ /*...@relnull@*/
rpmjs _rpmjsI = NULL;
-#undef WITH_TRACEMONKEY
+#define WITH_TRACEMONKEY
#if defined(WITH_JS)
static JSBool
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
