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:   16-Jul-2017 20:15:42
  Branch: rpm-5_4                          Handle: 2017071618154100

  Modified files:           (Branch: rpm-5_4)
    rpm                     Makefile.am autogen.sh configure.ac devtool.conf

  Log:
    - configuration for --with-zstd=internal etc.

  Summary:
    Revision    Changes     Path
    2.263.2.48  +9  -4      rpm/Makefile.am
    2.110.2.19  +22 -7      rpm/autogen.sh
    2.472.2.179 +47 -1      rpm/configure.ac
    2.365.2.114 +31 -3      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.263.2.47 -r2.263.2.48 Makefile.am
  --- rpm/Makefile.am   12 Jun 2017 06:46:18 -0000      2.263.2.47
  +++ rpm/Makefile.am   16 Jul 2017 18:15:41 -0000      2.263.2.48
  @@ -8,12 +8,17 @@
        --prefix=/usr \
           --libdir=/usr/lib64 \
           --enable-shared \
  -     --with-db \
  +     --with-db=/usr/lib64:/usr/include/db62 \
        --with-dbsql \
  -     --without-db-tools-intergrated \
  +     --without-db-tools-integrated \
        --with-zlib \
        --with-bzip2 \
        --with-xz \
  +     --with-zstd=no \
  +     --with-snappy=no \
  +     --with-lz4=no \
  +     --with-brotli=no \
  +     --with-lzfse=no \
           --with-file \
           --with-path-magic=/usr/share/file/magic \
           --with-lua \
  @@ -182,10 +187,10 @@
        @WITH_DB_SUBDIR@ \
        @WITH_ZLIB_SUBDIR@ \
        @WITH_ZSTD_SUBDIR@ \
  -     @WITH_BROTLI_SUBDIR@ \
  +     @WITH_LZ4_SUBDIR@ \
        @WITH_SNAPPY_SUBDIR@ \
  +     @WITH_BROTLI_SUBDIR@ \
        @WITH_LZFSE_SUBDIR@ \
  -     @WITH_LZ4_SUBDIR@ \
        @WITH_PCRE_SUBDIR@ \
        @WITH_POPT_SUBDIR@ \
        @WITH_LUA_SUBDIR@ \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  ============================================================================
  $ cvs diff -u -r2.110.2.18 -r2.110.2.19 autogen.sh
  --- rpm/autogen.sh    12 Jun 2017 06:46:46 -0000      2.110.2.18
  +++ rpm/autogen.sh    16 Jul 2017 18:15:41 -0000      2.110.2.19
  @@ -1376,20 +1376,35 @@
       ( cd $dir && cmake . && 
        echo "check: test" >> Makefile &&
        echo "distclean: clean" >> Makefile
  -     cp *.la lib/
  -     mkdir lib/.libs
  -     ln -sf ../libflatccrt.a lib/.libs/libflatccrt.a
  +     #cp *.la lib/
  +     #mkdir -p lib/.libs
  +     #ln -sf ../libflatccrt.a lib/.libs/libflatccrt.a
       )
       ;;
  -  brotli)
  -    ;;
  -  lzfse)
  +  zstd)
       ;;
     lz4)
       ;;
     snappy)
  +    ( cd $dir && sh ./autogen.sh )
       ;;
  -  zstd)
  +  brotli)
  +    ( cd $dir && ./configure-cmake --prefix=/usr --libdir=/usr/lib64 &&
  +     echo "check: test" >> ../Makefile &&
  +     echo "distclean: clean" >> ../Makefile
  +    )
  +    ;;
  +  lzfse)
  +    ( cd $dir
  +        cmake . \
  +            -DLZFSE_BUNDLE_MODE:BOOL=OFF \
  +            -DBUILD_SHARED_LIBS:BOOL=ON \
  +            -DCMAKE_INSTALL_BINDIR:PATH=/usr/bin \
  +            -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib64 \
  +            -DCMAKE_INSTALL_INCLUDEDIR:PATH=/usr/include
  +     echo "check: test" >> Makefile
  +     echo "distclean: clean"
  +    )
       ;;
     libgit2)
       ( cd $dir && cmake . && 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.472.2.178 -r2.472.2.179 configure.ac
  --- rpm/configure.ac  16 Jul 2017 04:20:02 -0000      2.472.2.178
  +++ rpm/configure.ac  16 Jul 2017 18:15:41 -0000      2.472.2.179
  @@ -2403,9 +2403,36 @@
   dnl # Google Brotli
   RPM_CHECK_LIB(
       [Google Brotli], [brotli],
  -    [brotli], [XXX], [version.h],
  +    [brotlienc], [BrotliGetDictionary], [brotli/types.h],
       [no,internal:external:none], [brotli:c/include],
       [
  +        AC_CHECK_FUNCS(BrotliGetDictionary)
  +        AC_CHECK_FUNCS(BrotliSetDictionaryData)
  +        AC_CHECK_FUNCS(BrotliEncoderCompress)
  +        AC_CHECK_FUNCS(BrotliEncoderCompressStream)
  +        AC_CHECK_FUNCS(BrotliEncoderCreateInstance)
  +        AC_CHECK_FUNCS(BrotliEncoderDestroyInstance)
  +        AC_CHECK_FUNCS(BrotliEncoderHasMoreOutput)
  +        AC_CHECK_FUNCS(BrotliEncoderIsFinished)
  +        AC_CHECK_FUNCS(BrotliEncoderMaxCompressedSize)
  +        AC_CHECK_FUNCS(BrotliEncoderSetCustomDictionary)
  +        AC_CHECK_FUNCS(BrotliEncoderSetParameter)
  +        AC_CHECK_FUNCS(BrotliEncoderTakeOutput)
  +        AC_CHECK_FUNCS(BrotliEncoderVersion)
  +        LIBS="-lbrotlidec $LIBS"
  +        AC_CHECK_FUNCS(BrotliDecoderCreateInstance)
  +        AC_CHECK_FUNCS(BrotliDecoderDecompress)
  +        AC_CHECK_FUNCS(BrotliDecoderDecompressStream)
  +        AC_CHECK_FUNCS(BrotliDecoderDestroyInstance)
  +        AC_CHECK_FUNCS(BrotliDecoderErrorString)
  +        AC_CHECK_FUNCS(BrotliDecoderGetErrorCode)
  +        AC_CHECK_FUNCS(BrotliDecoderHasMoreOutput)
  +        AC_CHECK_FUNCS(BrotliDecoderIsFinished)
  +        AC_CHECK_FUNCS(BrotliDecoderIsUsed)
  +        AC_CHECK_FUNCS(BrotliDecoderSetCustomDictionary)
  +        AC_CHECK_FUNCS(BrotliDecoderSetParameter)
  +        AC_CHECK_FUNCS(BrotliDecoderTakeOutput)
  +        AC_CHECK_FUNCS(BrotliDecoderVersion)
       ], [])
   
   dnl # Google Snappy
  @@ -2427,6 +2454,25 @@
       [lzfse], [lzfse_encode_init], [lzfse.h],
       [no,internal:external:none], [lzfse:src],
       [
  +        AC_CHECK_FUNCS(fse_init_decoder_table)
  +        AC_CHECK_FUNCS(fse_init_encoder_table)
  +        AC_CHECK_FUNCS(fse_init_value_decoder_table)
  +        AC_CHECK_FUNCS(fse_normalize_freq)
  +        AC_CHECK_FUNCS(lzfse_decode)
  +        AC_CHECK_FUNCS(lzfse_decode_buffer)
  +        AC_CHECK_FUNCS(lzfse_decode_buffer_with_scratch)
  +        AC_CHECK_FUNCS(lzfse_decode_scratch_size)
  +        AC_CHECK_FUNCS(lzfse_encode_base)
  +        AC_CHECK_FUNCS(lzfse_encode_buffer)
  +        AC_CHECK_FUNCS(lzfse_encode_buffer_with_scratch)
  +        AC_CHECK_FUNCS(lzfse_encode_finish)
  +        AC_CHECK_FUNCS(lzfse_encode_init)
  +        AC_CHECK_FUNCS(lzfse_encode_scratch_size)
  +        AC_CHECK_FUNCS(lzfse_encode_translate)
  +        AC_CHECK_FUNCS(lzvn_decode)
  +        AC_CHECK_FUNCS(lzvn_encode)
  +        AC_CHECK_FUNCS(lzvn_encode_buffer)
  +        AC_CHECK_FUNCS(lzvn_encode_scratch_size)
       ], [])
   
   dnl # LZ4
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.365.2.113 -r2.365.2.114 devtool.conf
  --- rpm/devtool.conf  16 Jul 2017 04:20:02 -0000      2.365.2.113
  +++ rpm/devtool.conf  16 Jul 2017 18:15:41 -0000      2.365.2.114
  @@ -3,7 +3,7 @@
   ##
   
   %common
  -    MODULE_NAMES="beecrypt brotli flatcc gnulib gpsee libgit2 libtpm lua lz4 
lzfse neon pcre perl-URPM popt snappy syck zstd"
  +    MODULE_NAMES="beecrypt brotli flatcc gnulib gpsee libgit2 libtpm lua lz4 
lzfse mozjs neon pcre perl-URPM popt snappy syck zstd"
       MODULE_TAG_BASH=""               # XXX bash is GPLv2 and cannot be 
bundled w RPM
       MODULE_TAG_BEECRYPT="rpm-5_4"
       MODULE_TAG_DB=""
  @@ -31,10 +31,30 @@
   ## https://github.com/google/snappy
   ## https://github.com/lzfse/lzfse.git
   ## https://github.com/andikleen/snappy-c.git
  +    MOZJS_VERSION=45.9.0esr
  +    MOZJS_TARBALL=firefox-${MOZJS_VERSION}.source.tar.xz
  +    
MOZJS_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZJS_VERSION}/source/${MOZJS_TARBALL}
   
   %checkout
       for name in $MODULE_NAMES "$@"; do
         case "${name}" in
  +      mozjs)
  +            [ ! -d ${DEVTOOL_SRCDIR}/js ] && continue
  +            echo "===> ${name} (in ${DEVTOOL_SRCDIR}/js)"
  +            if [ ! -f ${DEVTOOL_SRCDIR}/js/${MOZJS_TARBALL} ]; then
  +                cmd="wget -q ${MOZJS_URL}"
  +                echo "     $cmd"
  +                (cd ${DEVTOOL_SRCDIR}/js && $cmd)
  +            fi
  +            if [ ! -d ${DEVTOOL_SRCDIR}/js/mozilla-release ]; then
  +                cmd="tar xf ${MOZJS_TARBALL}"
  +                echo "     $cmd"
  +                (cd ${DEVTOOL_SRCDIR}/js && $cmd)
  +                cmd="mv firefox-${MOZJS_VERSION} mozilla-release"
  +                echo "     $cmd"
  +                (cd ${DEVTOOL_SRCDIR}/js && $cmd)
  +            fi
  +        ;;
         lzfse)
               if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
                   cmd="git pull"
  @@ -994,7 +1014,11 @@
           --with-zlib \
           --with-bzip2 \
           --with-xz \
  -        --with-zstd \
  +        --with-zstd=internal \
  +        --with-lz4=internal \
  +        --with-snappy=internal \
  +        --with-brotli=internal \
  +        --with-lzfse=internal \
           --with-file \
           --with-path-magic=/usr/share/file/magic \
           --with-lua=internal \
  @@ -1191,7 +1215,11 @@
           --with-zlib \
           --with-bzip2 \
           --with-xz \
  -        --with-zstd \
  +        --with-zstd=internal \
  +        --with-lz4=internal \
  +        --with-snappy=internal \
  +        --with-brotli=internal \
  +        --with-lzfse=internal \
           --with-file \
           --with-path-magic=/usr/share/file/magic \
           --with-lua=internal \
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to