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: 12-Oct-2014 23:22:36
Branch: rpm-5_4 Handle: 2014101221223600
Modified files: (Branch: rpm-5_4)
rpm/build parseScript.c
Log:
- js: stub in mozjs-{24,31} goop.
Summary:
Revision Changes Path
2.80.2.5 +7 -2 rpm/build/parseScript.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/parseScript.c
============================================================================
$ cvs diff -u -r2.80.2.4 -r2.80.2.5 parseScript.c
--- rpm/build/parseScript.c 6 Aug 2014 20:42:33 -0000 2.80.2.4
+++ rpm/build/parseScript.c 12 Oct 2014 21:22:36 -0000 2.80.2.5
@@ -8,11 +8,16 @@
#include <rpmio.h>
#include <rpmiotypes.h>
#include <rpmlog.h>
+#include <rpmlua.h>
+
#define _RPMEVR_INTERNAL
#include "rpmbuild.h"
+
#include "debug.h"
-#include <rpmlua.h>
+#if defined(WITH_GPSEE) || defined(WITH_MOZJS185) || defined(WITH_MOZJS24)
|| defined(WITH_MOZJS31)
+#define WITH_MOZJS 1
+#endif
/*@access poptContext @*/ /* compared with NULL */
@@ -335,7 +340,7 @@
"BuiltinJVMBeanShell", "5.4.15-1");
} else
#endif
-#ifdef WITH_GPSEE
+#if defined(WITH_MOZJS)
if (!strcmp(progArgv[0], "<js>")) {
(void) rpmlibNeedsFeature(pkg->header,
"BuiltinJavaScript", "5.2-1");
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
