[CVS] RPM: rpm-5_4: rpm/js/src/ Makefile.am

2017-07-08 Thread Jeff Johnson
  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 22:32:11
  Branch: rpm-5_4  Handle: 2017070820321100

  Modified files:   (Branch: rpm-5_4)
rpm/js/src  Makefile.am

  Log:
- rpmjs45: uncouple from the mozilla-release tree.

  Summary:
RevisionChanges Path
1.1.2.5 +4  -4  rpm/js/src/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/js/src/Makefile.am
  
  $ cvs diff -u -r1.1.2.4 -r1.1.2.5 Makefile.am
  --- rpm/js/src/Makefile.am8 Jul 2017 19:56:57 -   1.1.2.4
  +++ rpm/js/src/Makefile.am8 Jul 2017 20:32:11 -   1.1.2.5
  @@ -51,7 +51,7 @@
   EXTRA_PROGRAMS =
   noinst_PROGRAMS = js
   
  -moz_srcdir = ${top_srcdir}/js/mozilla-release/js/src
  +moz_srcdir = ${top_srcdir}/js/extract
   
   #mozilla-release/memory/build/mozmemory_wrap.c \
   #mozilla-release/mozglue/misc/TimeStamp.cpp \
  @@ -119,11 +119,11 @@
-fPIC \
-DMOZILLA_CLIENT \
-D'moz_xmalloc(_len)=malloc(_len)' \
  - -I${moz_srcdir}/shell \
  - -I${moz_srcdir} \
  + -I${moz_srcdir}/js/src \
  + -I${moz_srcdir}/mfbt \
  + -I${top_srcdir}/js/include \
-I${srcdir} \
-I${builddir} \
  - -I${top_srcdir}/js/include \
-include ${top_srcdir}/config.h \
-Uioctl -Drpl_ioctl=ioctl \
-include js-confdefs.h \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/js/src/ Makefile.am

2017-07-08 Thread Jeff Johnson
  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 20:52:11
  Branch: rpm-5_4  Handle: 2017070818521100

  Modified files:   (Branch: rpm-5_4)
rpm/js/src  Makefile.am

  Log:
- rpmjs45: haul out linkage trash.

  Summary:
RevisionChanges Path
1.1.2.3 +0  -9  rpm/js/src/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/js/src/Makefile.am
  
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 Makefile.am
  --- rpm/js/src/Makefile.am8 Jul 2017 15:35:13 -   1.1.2.2
  +++ rpm/js/src/Makefile.am8 Jul 2017 18:52:11 -   1.1.2.3
  @@ -164,21 +164,12 @@
   libmozjs_la_SOURCES =$(MOZ_SOURCES)
   libmozjs_la_CPPFLAGS =   $(MOZ_CPPFLAGS)
   libmozjs_la_CXXFLAGS =   $(MOZ_CXXFLAGS)
  -libmozjs_la_LIBADD = \
  - -L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib \
  - -lmozglue -lmemory \
  - -lm -ldl  -lffi -licui18n -licuuc -licudata
   libmozjs_la_LDFLAGS =
   
   js_SOURCES = js45shim.cpp js45.cpp
   js_CPPFLAGS =$(MOZ_CPPFLAGS)
   js_CXXFLAGS =$(MOZ_CXXFLAGS)
   js_LDADD =   libmozjs.la
  -#-L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib \
  -#-lmozglue -lmemory \
  -#-lffi -licui18n -licuuc -licudata
  -#js_LDFLAGS = \
  -#-R${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib
   
   foo: js rpmjss.inp
./js -f rpmjss.inp
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org