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: 08-Jul-2017 09:39:17
Branch: rpm-5_4 Handle: 2017070807391700
Modified files: (Branch: rpm-5_4)
rpm/js Makefile.am rpmjs45.cpp
Log:
- rpmjs45: uncouple (mostly) from -lmozjs-45.
Summary:
Revision Changes Path
1.44.2.13 +125 -11 rpm/js/Makefile.am
1.1.2.4 +0 -36 rpm/js/rpmjs45.cpp
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
============================================================================
$ cvs diff -u -r1.44.2.12 -r1.44.2.13 Makefile.am
--- rpm/js/Makefile.am 7 Jul 2017 10:02:57 -0000 1.44.2.12
+++ rpm/js/Makefile.am 8 Jul 2017 07:39:17 -0000 1.44.2.13
@@ -88,34 +88,143 @@
EXTRA_PROGRAMS = rpmjs45 rpmjs52 v8
noinst_PROGRAMS = tjs
+moz_srcdir = ${srcdir}/mozilla-release/js/src
+moz_builddir = ${builddir}/platform/x86_64/linux/build
+# mozilla-release/memory/build/mozmemory_wrap.c \
+# mozilla-release/mozglue/misc/TimeStamp.cpp \
+# mozilla-release/mozglue/misc/TimeStamp_posix.cpp \
+# ${moz_srcdir}/memory/mozalloc/Unified_cpp_memory_mozalloc0.cpp \
+# mozilla-release/mfbt/decimal/Decimal.cpp \
+# ${moz_srcdir}/mfbt/Unified_cpp_mfbt0.cpp \
+# ${moz_srcdir}/jsarray.cpp \
+# ${moz_srcdir}/jsatom.cpp \
+# ${moz_srcdir}/jsmath.cpp \
+# ${moz_srcdir}/builtin/RegExp.cpp \
+# ${moz_srcdir}/ctypes/CTypes.cpp \
+# ${moz_srcdir}/ctypes/Library.cpp \
+# ${moz_srcdir}/frontend/Parser.cpp \
+# ${moz_srcdir}/gc/StoreBuffer.cpp \
+# ${moz_srcdir}/jit/x86-shared/Disassembler-x86-shared.cpp \
+# ${moz_srcdir}/perf/pm_linux.cpp \
+# ${moz_srcdir}/vm/Initialization.cpp \
+# ${moz_srcdir}/vm/TraceLogging.cpp \
+# ${moz_srcdir}/vm/TraceLoggingGraph.cpp \
+# ${moz_builddir}/Unified_cpp_js_src0.cpp \
+# ${moz_builddir}/Unified_cpp_js_src1.cpp \
+# ${moz_builddir}/Unified_cpp_js_src2.cpp \
+# ${moz_builddir}/Unified_cpp_js_src3.cpp \
+# ${moz_builddir}/Unified_cpp_js_src4.cpp \
+# ${moz_builddir}/Unified_cpp_js_src5.cpp \
+# ${moz_builddir}/Unified_cpp_js_src6.cpp \
+# ${moz_builddir}/Unified_cpp_js_src7.cpp \
+# ${moz_builddir}/Unified_cpp_js_src8.cpp \
+# ${moz_builddir}/Unified_cpp_js_src9.cpp \
+# ${moz_builddir}/Unified_cpp_js_src10.cpp \
+# ${moz_builddir}/Unified_cpp_js_src11.cpp \
+# ${moz_builddir}/Unified_cpp_js_src12.cpp \
+# ${moz_builddir}/Unified_cpp_js_src13.cpp \
+# ${moz_builddir}/Unified_cpp_js_src14.cpp \
+# ${moz_builddir}/Unified_cpp_js_src15.cpp \
+# ${moz_builddir}/Unified_cpp_js_src16.cpp \
+# ${moz_builddir}/Unified_cpp_js_src17.cpp \
+# ${moz_builddir}/Unified_cpp_js_src18.cpp \
+# ${moz_builddir}/Unified_cpp_js_src19.cpp \
+# ${moz_builddir}/Unified_cpp_js_src20.cpp \
+# ${moz_builddir}/Unified_cpp_js_src21.cpp \
+# ${moz_builddir}/Unified_cpp_js_src22.cpp \
+# ${moz_builddir}/Unified_cpp_js_src23.cpp \
+# ${moz_builddir}/Unified_cpp_js_src24.cpp \
+# ${moz_builddir}/Unified_cpp_js_src25.cpp \
+# ${moz_builddir}/Unified_cpp_js_src26.cpp \
+# ${moz_builddir}/Unified_cpp_js_src27.cpp \
+# ${moz_builddir}/Unified_cpp_js_src28.cpp \
+# ${moz_builddir}/Unified_cpp_js_src29.cpp \
+# ${moz_builddir}/Unified_cpp_js_src30.cpp \
+# ${moz_builddir}/Unified_cpp_js_src31.cpp \
+# ${moz_builddir}/Unified_cpp_js_src32.cpp \
+# ${moz_builddir}/Unified_cpp_js_src33.cpp \
+# ${moz_builddir}/Unified_cpp_js_src34.cpp \
+# ${moz_builddir}/Unified_cpp_js_src35.cpp \
+# ${moz_builddir}/Unified_cpp_js_src36.cpp
+
rpmjs45_SOURCES = \
+ ${moz_srcdir}/jsarray.cpp \
+ ${moz_srcdir}/jsatom.cpp \
+ ${moz_srcdir}/jsmath.cpp \
+ ${moz_srcdir}/builtin/RegExp.cpp \
+ ${moz_srcdir}/gc/StoreBuffer.cpp \
+ ${moz_srcdir}/frontend/Parser.cpp \
+ ${moz_srcdir}/jit/x86-shared/Disassembler-x86-shared.cpp \
+ ${moz_srcdir}/vm/Initialization.cpp \
+ ${moz_srcdir}/vm/TraceLogging.cpp \
+ ${moz_srcdir}/vm/TraceLoggingGraph.cpp \
+ ${moz_builddir}/Unified_cpp_js_src0.cpp \
+ ${moz_builddir}/Unified_cpp_js_src1.cpp \
+ ${moz_builddir}/Unified_cpp_js_src2.cpp \
+ ${moz_builddir}/Unified_cpp_js_src3.cpp \
+ ${moz_builddir}/Unified_cpp_js_src4.cpp \
+ ${moz_builddir}/Unified_cpp_js_src5.cpp \
+ ${moz_builddir}/Unified_cpp_js_src6.cpp \
+ ${moz_builddir}/Unified_cpp_js_src7.cpp \
+ ${moz_builddir}/Unified_cpp_js_src8.cpp \
+ ${moz_builddir}/Unified_cpp_js_src9.cpp \
+ ${moz_builddir}/Unified_cpp_js_src10.cpp \
+ ${moz_builddir}/Unified_cpp_js_src11.cpp \
+ ${moz_builddir}/Unified_cpp_js_src12.cpp \
+ ${moz_builddir}/Unified_cpp_js_src13.cpp \
+ ${moz_builddir}/Unified_cpp_js_src14.cpp \
+ ${moz_builddir}/Unified_cpp_js_src15.cpp \
+ ${moz_builddir}/Unified_cpp_js_src16.cpp \
+ ${moz_builddir}/Unified_cpp_js_src17.cpp \
+ ${moz_builddir}/Unified_cpp_js_src18.cpp \
+ ${moz_builddir}/Unified_cpp_js_src19.cpp \
+ ${moz_builddir}/Unified_cpp_js_src20.cpp \
+ ${moz_builddir}/Unified_cpp_js_src21.cpp \
+ ${moz_builddir}/Unified_cpp_js_src22.cpp \
+ ${moz_builddir}/Unified_cpp_js_src23.cpp \
+ ${moz_builddir}/Unified_cpp_js_src24.cpp \
+ ${moz_builddir}/Unified_cpp_js_src25.cpp \
+ ${moz_builddir}/Unified_cpp_js_src26.cpp \
+ ${moz_builddir}/Unified_cpp_js_src27.cpp \
+ ${moz_builddir}/Unified_cpp_js_src28.cpp \
+ ${moz_builddir}/Unified_cpp_js_src29.cpp \
+ ${moz_builddir}/Unified_cpp_js_src30.cpp \
+ ${moz_builddir}/Unified_cpp_js_src31.cpp \
+ ${moz_builddir}/Unified_cpp_js_src32.cpp \
+ ${moz_builddir}/Unified_cpp_js_src33.cpp \
+ ${moz_builddir}/Unified_cpp_js_src34.cpp \
+ ${moz_builddir}/Unified_cpp_js_src35.cpp \
+ ${moz_builddir}/Unified_cpp_js_src36.cpp \
rpmjs45.cpp
rpmjs45_CPPFLAGS = \
-DEXPORT_JS_API \
-DJS_HAS_CTYPES \
+ -DDLL_PREFIX='"lib"' -DDLL_SUFFIX='".so"' \
-fPIC \
-DMOZILLA_CLIENT \
+ -D'moz_xmalloc(_len)=malloc(_len)' \
-I./include \
- -I./mozilla-release/js/src/js/src/shell \
- -I./mozilla-release/js/src/js/src \
+ -I${moz_builddir} \
+ -I${moz_srcdir}/js/src/shell \
+ -I${moz_srcdir}/js/src \
+ -I${moz_srcdir}/dist/include \
+ -I${moz_srcdir}/shell \
+ -I${moz_srcdir} \
+ -I../rpmio \
+ -include ${top_srcdir}/config.h \
-include js-confdefs.h \
- -I./mozilla-release/js/src/dist/include \
- -I./mozilla-release/js/src/ \
-include js/RequiredDefines.h \
- -I../rpmio \
-fno-tree-vrp \
-fno-strict-aliasing \
-fno-delete-null-pointer-checks \
-Wsign-compare \
-Wtype-limits \
- -Wno-invalid-offsetof \
-Wcast-align \
- -fno-rtti \
+ -Wno-invalid-offsetof \
-ffunction-sections \
-fdata-sections \
-fno-exceptions \
-fno-math-errno \
- -std=gnu++0x \
-pthread \
-DNDEBUG \
-DTRIMMER \
@@ -123,8 +232,13 @@
-O3 \
-fomit-frame-pointer \
-DRPMJSS_SELF_TEST
+rpmjs_CXXFLAGS = \
+ -std=gnu++0x \
+ -fno-rtti
rpmjs45_LDADD = \
- -L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib -lmozjs-45
-lmozglue -lmemory \
+ -L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib \
+ -lmozjs-45 -lmozglue -lmemory \
+ -lm -ldl -lffi -licui18n -licuuc -licudata \
$(RPMIO_LDADD_COMMON)
rpmjs45_LDFLAGS = \
-R${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib
@@ -191,9 +305,9 @@
platform: extract
@echo "-- $@ --"
-# @sh -e ./gen-config.sh `uname -m` linux
+ @sh -e ./gen-config.sh `uname -m` linux
-clean-local:
+distclean-local:
rm -rf platform extract include mozilla-release
.PHONY: lint
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmjs45.cpp
============================================================================
$ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmjs45.cpp
--- rpm/js/rpmjs45.cpp 7 Jul 2017 11:29:12 -0000 1.1.2.3
+++ rpm/js/rpmjs45.cpp 8 Jul 2017 07:39:17 -0000 1.1.2.4
@@ -8,7 +8,6 @@
#include "system.h"
-
#include "mozilla/ArrayUtils.h"
#include "mozilla/Atomics.h"
#include "mozilla/DebugOnly.h"
@@ -56,20 +55,17 @@
#include "vm/ArgumentsObject.h"
#include "vm/Compression.h"
-#include "vm/Compression.cpp"
#include "vm/Debugger.h"
#include "vm/HelperThreads.h"
#include "vm/Monitor.h"
-#include "vm/Monitor.cpp"
#include "vm/Shape.h"
#include "vm/SharedArrayObject.h"
#include "vm/StringBuffer.h"
#include "vm/Time.h"
-#include "vm/Time.cpp"
#include "vm/TypedArrayObject.h"
#include "vm/WrapperObject.h"
@@ -145,7 +141,6 @@
};
namespace js {
-bool gCanUseExtraThreads = true;
namespace shell {
#ifdef NOTYET
@@ -2426,37 +2421,6 @@
* function readline()
* Provides a hook for scripts to read a line from stdin.
*/
-#ifndef NOTYET
-/* --- js/src/frontend/TokenStream.cpp */
-JS_FRIEND_API(int)
-js_fgets(char* buf, int size, FILE* file)
-{
- int n, i, c;
- bool crflag;
-
- n = size - 1;
- if (n < 0)
- return -1;
-
- crflag = false;
- for (i = 0; i < n && (c = getc_unlocked(file)) != EOF; i++) {
- buf[i] = c;
- if (c == '\n') { // any \n ends a line
- i++; // keep the \n; we know there is room for \0
- break;
- }
- if (crflag) { // \r not followed by \n ends line at the \r
- ungetc(c, file);
- break; // and overwrite c in buf with \0
- }
- crflag = (c == '\r');
- }
-
- buf[i] = '\0';
- return i;
-}
-#endif
-
static bool
ReadLine(JSContext* cx, unsigned argc, Value* vp)
{
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
