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 10:14:42
Branch: rpm-5_4 Handle: 2017070808144200
Added files: (Branch: rpm-5_4)
rpm/js rpmjs45shim.cpp
Modified files: (Branch: rpm-5_4)
rpm/js Makefile.am
Log:
- rpmjs45: uncouple from -lmozjs45 completely.
Summary:
Revision Changes Path
1.44.2.14 +2 -11 rpm/js/Makefile.am
1.1.2.1 +14 -0 rpm/js/rpmjs45shim.cpp
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
============================================================================
$ cvs diff -u -r1.44.2.13 -r1.44.2.14 Makefile.am
--- rpm/js/Makefile.am 8 Jul 2017 07:39:17 -0000 1.44.2.13
+++ rpm/js/Makefile.am 8 Jul 2017 08:14:42 -0000 1.44.2.14
@@ -148,16 +148,7 @@
# ${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 \
+ rpmjs45shim.cpp \
${moz_builddir}/Unified_cpp_js_src0.cpp \
${moz_builddir}/Unified_cpp_js_src1.cpp \
${moz_builddir}/Unified_cpp_js_src2.cpp \
@@ -237,7 +228,7 @@
-fno-rtti
rpmjs45_LDADD = \
-L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib \
- -lmozjs-45 -lmozglue -lmemory \
+ -lmozglue -lmemory \
-lm -ldl -lffi -licui18n -licuuc -licudata \
$(RPMIO_LDADD_COMMON)
rpmjs45_LDFLAGS = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmjs45shim.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 rpmjs45shim.cpp
--- /dev/null 2017-07-08 10:11:00.000000000 +0200
+++ rpmjs45shim.cpp 2017-07-08 10:14:42.677279338 +0200
@@ -0,0 +1,14 @@
+#include "mfbt/Unified_cpp_mfbt0.cpp"
+#include "jsarray.cpp"
+#include "jsatom.cpp"
+#include "jsmath.cpp"
+#include "builtin/RegExp.cpp"
+#include "ctypes/CTypes.cpp"
+#include "ctypes/Library.cpp"
+#include "frontend/Parser.cpp"
+#include "gc/StoreBuffer.cpp"
+#include "jit/x86-shared/Disassembler-x86-shared.cpp"
+#include "perf/pm_linux.cpp"
+#include "vm/Initialization.cpp"
+#include "vm/TraceLogging.cpp"
+#include "vm/TraceLoggingGraph.cpp"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
