[CVS] RPM: rpm-5_4: rpm/js/ extract.sh

2017-07-09 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:   09-Jul-2017 11:32:56
  Branch: rpm-5_4  Handle: 2017070909325600

  Modified files:   (Branch: rpm-5_4)
rpm/js  extract.sh

  Log:
- rpmjs54: keep ctypes for JS_HAS_CTYPES.

  Summary:
RevisionChanges Path
1.1.2.10+0  -1  rpm/js/extract.sh
  

  patch -p0 <<'@@ .'
  Index: rpm/js/extract.sh
  
  $ cvs diff -u -r1.1.2.9 -r1.1.2.10 extract.sh
  --- rpm/js/extract.sh 8 Jul 2017 19:56:57 -   1.1.2.9
  +++ rpm/js/extract.sh 9 Jul 2017 09:32:56 -   1.1.2.10
  @@ -112,7 +112,6 @@
   extract/js/src/config.status \
   extract/js/src/configure \
   extract/js/src/configure.in \
  -extract/js/src/ctypes \
   extract/js/src/doc \
   extract/js/src/editline \
   extract/js/src/gdb \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/js/ extract.sh 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 21:56:57
  Branch: rpm-5_4  Handle: 2017070819565700

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

  Log:
- rpmjs45: eliminate need for moziila-release/js/src/js/src include
path(s).

  Summary:
RevisionChanges Path
1.1.2.9 +4  -1  rpm/js/extract.sh
1.1.2.4 +2  -8  rpm/js/src/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/js/extract.sh
  
  $ cvs diff -u -r1.1.2.8 -r1.1.2.9 extract.sh
  --- rpm/js/extract.sh 8 Jul 2017 16:59:54 -   1.1.2.8
  +++ rpm/js/extract.sh 8 Jul 2017 19:56:57 -   1.1.2.9
  @@ -89,6 +89,7 @@
   
   cp -p mozilla-release/js/src/js/src/selfhosted.out.h extract/js/src
   cp -p mozilla-release/js/src/js/src/jsautokw.h extract/js/src
  +cp -p mozilla-release/js/src/js/src/shell/shellmoduleloader.out.h 
extract/js/src/shell
   
   # mfbt doesn't change by arch or platform, so keep the same unified cpp
   mkdir -p extract/js/src/mfbt/
  @@ -126,7 +127,6 @@
   extract/js/src/README.html \
   extract/js/src/root-deps.mk \
   extract/js/src/root.mk \
  -extract/js/src/shell \
   extract/js/src/skip_subconfigures \
   extract/js/src/subconfigures \
   extract/js/src/tests \
  @@ -162,6 +162,9 @@
   jsversion.h
   jswrapper.h
   perf/jsperf.h
  +selfhosted.out.h
  +jsautokw.h
  +shell/shellmoduleloader.out.h
   "
   for F in $FILES; do
   cp -p extract/js/src/$F include
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/js/src/Makefile.am
  
  $ cvs diff -u -r1.1.2.3 -r1.1.2.4 Makefile.am
  --- rpm/js/src/Makefile.am8 Jul 2017 18:52:11 -   1.1.2.3
  +++ rpm/js/src/Makefile.am8 Jul 2017 19:56:57 -   1.1.2.4
  @@ -119,15 +119,11 @@
-fPIC \
-DMOZILLA_CLIENT \
-D'moz_xmalloc(_len)=malloc(_len)' \
  - -I${moz_srcdir}/js/src/shell \
  - -I${moz_srcdir}/js/src \
  - -I${moz_srcdir}/dist/include \
-I${moz_srcdir}/shell \
-I${moz_srcdir} \
  - -I${moz_builddir} \
  - -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 \
  @@ -158,13 +154,11 @@
   
   noinst_LTLIBRARIES = libmozjs.la
   
  -noinst_HEADERS = \
  - js-confdefs.h
  +noinst_HEADERS = js-confdefs.h

   libmozjs_la_SOURCES =$(MOZ_SOURCES)
   libmozjs_la_CPPFLAGS =   $(MOZ_CPPFLAGS)
   libmozjs_la_CXXFLAGS =   $(MOZ_CXXFLAGS)
  -libmozjs_la_LDFLAGS =
   
   js_SOURCES = js45shim.cpp js45.cpp
   js_CPPFLAGS =$(MOZ_CPPFLAGS)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/js/ extract.sh gen-config.sh

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 18:59:54
  Branch: rpm-5_4  Handle: 2017070816595400

  Modified files:   (Branch: rpm-5_4)
rpm/js  extract.sh gen-config.sh

  Log:
- rpmjss: ensure that js/include is identical to
/usr/include/mozjs-XY.

  Summary:
RevisionChanges Path
1.1.2.8 +77 -26 rpm/js/extract.sh
1.1.2.7 +8  -5  rpm/js/gen-config.sh
  

  patch -p0 <<'@@ .'
  Index: rpm/js/extract.sh
  
  $ cvs diff -u -r1.1.2.7 -r1.1.2.8 extract.sh
  --- rpm/js/extract.sh 8 Jul 2017 05:27:41 -   1.1.2.7
  +++ rpm/js/extract.sh 8 Jul 2017 16:59:54 -   1.1.2.8
  @@ -4,22 +4,36 @@
   
   rm -rf extract
   
  -mkdir extract
  -mkdir extract/js
  -mkdir -p extract/intl/icu/source/common/unicode
  +mkdir -p extract/
  +mkdir -p extract/js/
  +mkdir -p extract/memory/build/
  +mkdir -p extract/memory/fallible/
  +mkdir -p extract/memory/mozjemalloc/
  +mkdir -p extract/memory/mozalloc/
  +mkdir -p extract/mozglue/misc/
  +mkdir -p extract/intl/icu/source/common/unicode/
   
  -cp -r mozilla-release/js/src mozilla-release/js/public extract/js/
  -cp -r mozilla-release/mfbt extract/
  +cp -p -r mozilla-release/js/src mozilla-release/js/public extract/js/
  +cp -p -r mozilla-release/mfbt extract/
   
   # We need these even without ICU
  -cp mozilla-release/intl/icu/source/common/unicode/platform.h 
extract/intl/icu/source/common/unicode
  -cp mozilla-release/intl/icu/source/common/unicode/ptypes.h 
extract/intl/icu/source/common/unicode
  -cp mozilla-release/intl/icu/source/common/unicode/uconfig.h 
extract/intl/icu/source/common/unicode
  -cp mozilla-release/intl/icu/source/common/unicode/umachine.h 
extract/intl/icu/source/common/unicode
  -cp mozilla-release/intl/icu/source/common/unicode/urename.h 
extract/intl/icu/source/common/unicode
  -cp mozilla-release/intl/icu/source/common/unicode/utypes.h 
extract/intl/icu/source/common/unicode
  -cp mozilla-release/intl/icu/source/common/unicode/uvernum.h 
extract/intl/icu/source/common/unicode
  -cp mozilla-release/intl/icu/source/common/unicode/uversion.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/platform.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/ptypes.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/uconfig.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/umachine.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/urename.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/utypes.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/uvernum.h 
extract/intl/icu/source/common/unicode
  +cp -p mozilla-release/intl/icu/source/common/unicode/uversion.h 
extract/intl/icu/source/common/unicode
  +
  +cp -p -r mozilla-release/memory/build/moz*.h extract/memory/build
  +cp -p -r mozilla-release/memory/fallible/fallible.h extract/memory/fallible
  +cp -p -r mozilla-release/memory/mozjemalloc/jemalloc_types.h 
extract/memory/mozjemalloc
  +cp -p -r mozilla-release/memory/mozalloc/mozalloc_abort.h 
extract/memory/mozalloc
  +cp -p -r mozilla-release/memory/mozalloc/mozalloc.h extract/memory/mozalloc
  +cp -p -r mozilla-release/memory/mozalloc/mozalloc_oom.h 
extract/memory/mozalloc
  +cp -p -r mozilla-release/mozglue/misc/StackWalk.h extract/mozglue/misc
  +cp -p -r mozilla-release/mozglue/misc/TimeStamp.h extract/mozglue/misc
   
   cd mozilla-release/js/src
   
  @@ -73,12 +87,12 @@
   
   cd ../../..
   
  -cp mozilla-release/js/src/js/src/selfhosted.out.h extract/js/src
  -cp mozilla-release/js/src/js/src/jsautokw.h extract/js/src
  +cp -p mozilla-release/js/src/js/src/selfhosted.out.h extract/js/src
  +cp -p mozilla-release/js/src/js/src/jsautokw.h extract/js/src
   
   # mfbt doesn't change by arch or platform, so keep the same unified cpp
  -mkdir extract/js/src/mfbt
  -cp mozilla-release/js/src/mfbt/Unified_cpp_mfbt0.cpp extract/js/src/mfbt
  +mkdir -p extract/js/src/mfbt/
  +cp -p mozilla-release/js/src/mfbt/Unified_cpp_mfbt0.cpp extract/js/src/mfbt
   
   sed 's/#include ".*\/mfbt\//#include "/' < 
extract/js/src/mfbt/Unified_cpp_mfbt0.cpp > t1
   sed 's/#error ".*\/mfbt\//#error "/' < t1 > 
extract/js/src/mfbt/Unified_cpp_mfbt0.cpp
  @@ -125,14 +139,13 @@
   
   # stuff we don't wan

[CVS] RPM: rpm-5_4: rpm/js/ extract.sh gen-config.sh

2017-07-07 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 07:27:41
  Branch: rpm-5_4  Handle: 2017070805274100

  Modified files:   (Branch: rpm-5_4)
rpm/js  extract.sh gen-config.sh

  Log:
- sanity.

  Summary:
RevisionChanges Path
1.1.2.7 +1  -1  rpm/js/extract.sh
1.1.2.5 +1  -1  rpm/js/gen-config.sh
  

  patch -p0 <<'@@ .'
  Index: rpm/js/extract.sh
  
  $ cvs diff -u -r1.1.2.6 -r1.1.2.7 extract.sh
  --- rpm/js/extract.sh 7 Jul 2017 10:02:57 -   1.1.2.6
  +++ rpm/js/extract.sh 8 Jul 2017 05:27:41 -   1.1.2.7
  @@ -43,10 +43,10 @@
--sharedstatedir=/var/lib \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
  + --enable-release \
--enable-optimize \
--enable-pie \
--enable-readline \
  - --enable-release \
--enable-shared-js \
--enable-system-ffi \
--enable-xterm-updates \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/js/gen-config.sh
  
  $ cvs diff -u -r1.1.2.4 -r1.1.2.5 gen-config.sh
  --- rpm/js/gen-config.sh  7 Jul 2017 10:02:57 -   1.1.2.4
  +++ rpm/js/gen-config.sh  8 Jul 2017 05:27:41 -   1.1.2.5
  @@ -30,10 +30,10 @@
--sharedstatedir=/var/lib \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
  + --enable-release \
--enable-optimize \
--enable-pie \
--enable-readline \
  - --enable-release \
--enable-shared-js \
--enable-system-ffi \
--enable-xterm-updates \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org