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:
    Revision    Changes     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 -0000       1.1.2.8
  +++ rpm/js/extract.sh 8 Jul 2017 19:56:57 -0000       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.am    8 Jul 2017 18:52:11 -0000       1.1.2.3
  +++ rpm/js/src/Makefile.am    8 Jul 2017 19:56:57 -0000       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 Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to