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-Jul-2017 12:09:25 Branch: rpm-5_4 Handle: 2017071010092500 Modified files: (Branch: rpm-5_4) rpm/js Makefile.am rpmjs45.cpp rpmjs45shim.cpp Log: - rpmjs: haul out the trash. Summary: Revision Changes Path 1.44.2.17 +9 -40 rpm/js/Makefile.am 1.1.2.9 +9 -0 rpm/js/rpmjs45.cpp 1.1.2.2 +10 -0 rpm/js/rpmjs45shim.cpp ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/js/Makefile.am ============================================================================ $ cvs diff -u -r1.44.2.16 -r1.44.2.17 Makefile.am --- rpm/js/Makefile.am 9 Jul 2017 16:11:12 -0000 1.44.2.16 +++ rpm/js/Makefile.am 10 Jul 2017 10:09:25 -0000 1.44.2.17 @@ -90,7 +90,7 @@ EXTRA_PROGRAMS = rpmjs45 rpmjs52 v8 noinst_PROGRAMS = tjs -moz_srcdir = ${srcdir}/mozilla-release/js/src +moz_srcdir = ${srcdir}/extract #moz_builddir = ${builddir}/platform/x86_64/linux/build moz_builddir = ${builddir}/src @@ -120,54 +120,23 @@ # ${moz_builddir}/shell/Unified_cpp_js_src_shell0.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${moz_srcdir}/js/src/shell \ + -I${moz_srcdir}/mfbt \ -I${moz_srcdir}/js/src \ - -I${moz_srcdir}/dist/include \ - -I${moz_srcdir}/shell \ - -I${moz_srcdir} \ - -I${moz_builddir} \ -I${srcdir}/include \ - -I${srcdir} \ - -I${builddir} \ -I../rpmio \ - -include ${top_srcdir}/config.h \ - -include js-confdefs.h \ - -include js/RequiredDefines.h \ - -fno-tree-vrp \ - -fno-strict-aliasing \ - -fno-delete-null-pointer-checks \ - -Wsign-compare \ - -Wtype-limits \ - -Wcast-align \ - -Wno-invalid-offsetof \ - -ffunction-sections \ - -fdata-sections \ - -fno-exceptions \ - -fno-math-errno \ + -include ${moz_srcdir}/js/src/js/src/js-confdefs.h \ -pthread \ - -DTRIMMER \ - -freorder-blocks \ - -O3 \ - -fomit-frame-pointer \ - -DRPMJSS_SELF_TEST -rpmjs_CXXFLAGS = \ - -std=gnu++0x \ - -fno-rtti + -fPIC \ + -O3 +#rpmjs_CXXFLAGS = \ +# -std=gnu++0x \ +# -fno-rtti rpmjs45_LDADD = \ - -L${abs_top_builddir}/js/src -lmozjs \ - -L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib \ - -lmozglue -lmemory \ - -lm -ldl -lffi -licui18n -licuuc -licudata \ + ${builddir}/src/libmozjs.la \ $(RPMIO_LDADD_COMMON) -rpmjs45_LDFLAGS = \ - -R${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib -#rpmjs45_CPPFLAGS = -include /usr/include/mozjs-45/js/RequiredDefines.h -I/usr/include/mozjs-45 -fPIC -DRPMJSS_SELF_TEST -#rpmjs45_LDADD = -L/usr/lib64 -lmozjs-45 foo: rpmjs45 ./rpmjs45 -f rpmjss.inp @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmjs45.cpp ============================================================================ $ cvs diff -u -r1.1.2.8 -r1.1.2.9 rpmjs45.cpp --- rpm/js/rpmjs45.cpp 9 Jul 2017 16:59:19 -0000 1.1.2.8 +++ rpm/js/rpmjs45.cpp 10 Jul 2017 10:09:25 -0000 1.1.2.9 @@ -1,3 +1,12 @@ +#pragma GCC diagnostic ignored "-Winvalid-offsetof" +#pragma GCC diagnostic ignored "-Wsuggest-attribute=const" +#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" +#pragma GCC diagnostic ignored "-Wextra" + +#include "system.h" +#undef ioctl +#define rpl_ioctl ioctl + /*==============================================================*/ #include "shell/OSObject.cpp" /*==============================================================*/ @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmjs45shim.cpp ============================================================================ $ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmjs45shim.cpp --- rpm/js/rpmjs45shim.cpp 8 Jul 2017 08:14:42 -0000 1.1.2.1 +++ rpm/js/rpmjs45shim.cpp 10 Jul 2017 10:09:25 -0000 1.1.2.2 @@ -1,3 +1,13 @@ +#pragma GCC diagnostic ignored "-Winvalid-offsetof" +#pragma GCC diagnostic ignored "-Wsuggest-attribute=const" +#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wunused-result" + +#include "system.h" +#undef ioctl +#define rpl_ioctl ioctl + #include "mfbt/Unified_cpp_mfbt0.cpp" #include "jsarray.cpp" #include "jsatom.cpp" @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org