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 06:20:02
Branch: rpm-5_4 Handle: 2017071604200200
Modified files: (Branch: rpm-5_4)
rpm CHANGES INSTALL acinclude.m4 configure.ac
devtool.conf
Log:
- bdb: upgrade to db-6.2.32.
Summary:
Revision Changes Path
1.3501.2.584+1 -0 rpm/CHANGES
2.134.2.34 +20 -1 rpm/INSTALL
2.31.2.7 +22 -18 rpm/acinclude.m4
2.472.2.178 +46 -24 rpm/configure.ac
2.365.2.113 +202 -10 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.583 -r1.3501.2.584 CHANGES
--- rpm/CHANGES 10 Jul 2017 10:27:21 -0000 1.3501.2.583
+++ rpm/CHANGES 16 Jul 2017 04:20:02 -0000 1.3501.2.584
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+ - jbj: bdb: upgrade to db-6.2.32.
- jbj: i18n: update PO files (Translation Project).
- jbj: rpmjs: upgrade js-1.8.5 with mozjs-45 (internal).
- jbj: macros: update %efi
(http://rpm5.org/community/rpm-devel/5699.html)/
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
============================================================================
$ cvs diff -u -r2.134.2.33 -r2.134.2.34 INSTALL
--- rpm/INSTALL 1 Jun 2017 18:38:24 -0000 2.134.2.33
+++ rpm/INSTALL 16 Jul 2017 04:20:02 -0000 2.134.2.34
@@ -37,7 +37,7 @@
Libtasn.1 mandatory - 4.8
http://www.gnu.org/software/libtasn1/
Neon mandatory 0.27.0 0.30.1 http://www.webdav.org/neon/
PCRE mandatory 7.0 8.39 http://www.pcre.org/
-Berkeley-DB [1] mandatory 6.1.23 6.2.23
http://www.oracle.com/database/berkeley-db.html
+Berkeley-DB [1] mandatory 6.1.23 6.2.32
http://www.oracle.com/database/berkeley-db.html
Mozilla NSS optional 3.11 3.27.0
http://www.mozilla.org/projects/security/pki/nss/
OpenSSL optional 0.9.8 1.1.0c http://www.openssl.org/
OpenSSL-FIPS[7] optional 2.0.5 2.0.9 http://www.openssl.org/
@@ -99,6 +99,25 @@
else
return (0);
---------------
+ and similar for db-6.2.32
+---------------
+diff -up db-6.2.32/src/env/env_failchk.c.jbj db-6.2.32/src/env/env_failchk.c
+--- db-6.2.32/src/env/env_failchk.c.jbj 2017-07-15 23:47:11.427479717
-0400
++++ db-6.2.32/src/env/env_failchk.c 2017-07-15 23:51:03.814121306 -0400
+@@ -669,8 +669,12 @@ __env_set_state(env, ipp, state)
+ || state == THREAD_CTR_VERIFY));
+ if (ipp != NULL)
+ *ipp = ip;
++#ifdef NOTYET
+ if (ip == NULL
+ || (ip->dbth_state == THREAD_OUT && state == THREAD_VERIFY))
++#else
++ if (ip == NULL) /* The control block wasn't found */
++#endif
+ return (USR_ERR(env, EINVAL));
+ else
+ return (0);
+---------------
(but any version of Berkeley-DB since db-4.5.20 will "work").
[2] lua: Modified Lua copy bundled with RPM.
@@ .
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
============================================================================
$ cvs diff -u -r2.31.2.6 -r2.31.2.7 acinclude.m4
--- rpm/acinclude.m4 11 May 2016 18:50:08 -0000 2.31.2.6
+++ rpm/acinclude.m4 16 Jul 2017 04:20:02 -0000 2.31.2.7
@@ -467,13 +467,17 @@
dnl # check for C header (in set of optionally multiple
possibilities)
AC_CHECK_HEADERS([$5], [], [ __rcl_found=no ])
dnl # check for C library (in set of optionally multiple
possibilities)
+ dnl # stop on first found library
__rcl_found_lib=no
- m4_foreach_w([__rcl_lib], [$3], [
+ while true; do
+ m4_foreach_w([__rcl_lib], [$3], [
AC_CHECK_LIB(m4_defn([__rcl_lib]), [$4])
dnl # manually check for success (do not use third
argument to AC_CHECK_LIB
dnl # here as this would no longer set the LIBS variable
(the default action)
- test
".${m4_translit(ac_cv_lib_[]m4_defn([__rcl_lib])_$4,[.-,],[___])}" = .yes &&
__rcl_found_lib=yes
- ])
+ test
".${m4_translit(ac_cv_lib_[]m4_defn([__rcl_lib])_$4,[.-,],[___])}" = .yes &&
__rcl_found_lib=yes && break
+ ])
+ break
+ done
test ".${__rcl_found_lib}" = .no && __rcl_found="no"
dnl # determine final results
with_$2=${__rcl_found}
@@ -848,7 +852,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_CLASS],[
AC_REQUIRE([AC_PROG_JAVA])
@@ -954,7 +958,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_CLASSPATH],[
if test "x$CLASSPATH" = x; then
@@ -997,7 +1001,7 @@
dnl chmod +x $@
dnl
dnl @author Luc Maisonobe
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_JUNIT],[
AC_CACHE_VAL(ac_cv_prog_JUNIT,[
@@ -1037,7 +1041,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_RQRD_CLASS],[
@@ -1063,7 +1067,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <kt...@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_JAVA_OPTIONS],[
AC_ARG_WITH(java-prefix,
@@ -1113,7 +1117,7 @@
dnl This particular macro is not part of the original set of macros.
dnl
dnl @author Don Anderson
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_JNI_INCLUDE_DIR],[
@@ -1229,7 +1233,7 @@
dnl configure.in, is included in the AC_PROG_JAVA macro.
dnl
dnl @author Egon Willighagen <eg...@sci.kun.nl>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAR],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1273,7 +1277,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAC],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1301,7 +1305,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAC_WORKS],[
AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
@@ -1349,7 +1353,7 @@
dnl configure.in, is included in the AC_PROG_JAVA macro.
dnl
dnl @author Egon Willighagen <eg...@sci.kun.nl>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVADOC],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1371,7 +1375,7 @@
dnl the full path of javah and CPPFLAGS is updated accordingly.
dnl
dnl @author Luc Maisonobe
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAH],[
AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
@@ -1456,7 +1460,7 @@
dnl AC_OUTPUT(Makefile)
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
dnl Note: Modified to prefer java over kaffe. [#8059]
dnl
@@ -1486,7 +1490,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVA_WORKS], [
AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes)
@@ -1588,7 +1592,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <kt...@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_TRY_COMPILE_JAVA],[
AC_REQUIRE([AC_PROG_JAVAC])dnl
@@ -1629,7 +1633,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <kt...@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.7 2017/07/16 04:20:02 jbj Exp $
dnl
AC_DEFUN([AC_TRY_RUN_JAVA],[
AC_REQUIRE([AC_PROG_JAVAC])dnl
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.177 -r2.472.2.178 configure.ac
--- rpm/configure.ac 10 Jul 2017 20:11:22 -0000 2.472.2.177
+++ rpm/configure.ac 16 Jul 2017 04:20:02 -0000 2.472.2.178
@@ -165,7 +165,7 @@
RPM_CPPFLAGS=""
RPM_CXXFLAGS=""
-RPM_CFLAGS=""
+RPM_CFLAGS="--std=gnu99"
RPM_LDFLAGS=""
AC_ARG_ENABLE(build-warnings,
@@ -1104,8 +1104,6 @@
MYPATH=$PATH
fi
-DBXY=db62
-
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
@@ -1117,22 +1115,6 @@
AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
-AC_PATH_PROGS(__DB_ARCHIVE, [${DBXY}_archive db_archive], db_archive,
$MYPATH)
-AC_PATH_PROGS(__DB_CHECKPOINT, [${DBXY}_checkpoint db_checkpoint],
db_checkpoint, $MYPATH)
-AC_PATH_PROGS(__DB_DEADLOCK, [${DBXY}_deadlock db_deadlock], db_deadlock,
$MYPATH)
-AC_PATH_PROGS(__DB_DUMP, [${DBXY}_dump db_dump], db_dump, $MYPATH)
-AC_PATH_PROGS(__DB_HOTBACKUP, [${DBXY}_hotbackup db_hootbackup],
db_hotbackup, $MYPATH)
-AC_PATH_PROGS(__DB_LOAD, [${DBXY}_load db_load], db_load, $MYPATH)
-AC_PATH_PROGS(__DB_LOG_VERIFY, [${DBXY}_log_verify db_log_verify],
db_log_verify, $MYPATH)
-AC_PATH_PROGS(__DB_PRINTLOG, [${DBXY}_printlog db_printlog], db_printlog,
$MYPATH)
-AC_PATH_PROGS(__DB_RECOVER, [${DBXY}_recover db_recover], db_recover,
$MYPATH)
-AC_PATH_PROGS(__DB_REPLICATE, [${DBXY}_replicate db_replicate],
db_replicate, $MYPATH)
-AC_PATH_PROGS(__DBSQL, [${DBXY}sql dbsql], dbsql, $MYPATH)
-AC_PATH_PROGS(__DB_SQL_CODEGEN, [${DBXY}_sql_codegen db_sql_codegen],
db_sql_codegen, $MYPATH)
-AC_PATH_PROGS(__DB_STAT, [${DBXY}_stat db_stat], db_stat, $MYPATH)
-AC_PATH_PROGS(__DB_TUNER, [${DBXY}_tuner db_tuner], db_tuner, $MYPATH)
-AC_PATH_PROGS(__DB_UPGRADE, [${DBXY}_upgrade db_upgrade], db_upgrade,
$MYPATH)
-AC_PATH_PROGS(__DB_VERIFY, [${DBXY}_verify db_verify], db_verify, $MYPATH)
AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
@@ -2760,7 +2742,6 @@
AC_CHECK_FUNCS(context_user_set)
AC_CHECK_FUNCS(fgetfilecon)
AC_CHECK_FUNCS(fgetfilecon_raw)
- AC_CHECK_FUNCS(_fini)
AC_CHECK_FUNCS(fini_selinuxmnt)
AC_CHECK_FUNCS(freecon)
AC_CHECK_FUNCS(freeconary)
@@ -2793,7 +2774,6 @@
AC_CHECK_FUNCS(getseuserbyname)
AC_CHECK_FUNCS(getsockcreatecon)
AC_CHECK_FUNCS(getsockcreatecon_raw)
- AC_CHECK_FUNCS(_init)
AC_CHECK_FUNCS(is_context_customizable)
AC_CHECK_FUNCS(is_selinux_enabled)
AC_CHECK_FUNCS(is_selinux_mls_enabled)
@@ -3621,13 +3601,39 @@
dnl # Berkeley-DB & SQLite
DBLIBSRCS=""
+DBXY=""
RPM_CHECK_LIB(
[Berkeley-DB], [db],
- [db-6.2], [db_create], [db.h],
+ [db-6.2 db-6.1 db-6.0 db-5.3 db-5.2], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" =
.internal ])
+
+ DBXY=$(echo $LIBS | sed -e 's,.*-ldb-\([[0-9]]\)\.\([[0-9]]\)
.*,db\1\2,p' -ed)
+ if test ".$DBXY" != .; then
+ $(echo "$CPPFLAGS" | grep -- "-I$includedir/$DBXY">/dev/null) || \
+ CPPFLAGS="-I$includedir/$DBXY $CPPFLAGS"
+ fi
+
+ AC_PATH_PROGS(__DB_ARCHIVE, [${DBXY}_archive db_archive], db_archive,
$MYPATH)
+ AC_PATH_PROGS(__DB_CHECKPOINT, [${DBXY}_checkpoint db_checkpoint],
db_checkpoint, $MYPATH)
+ AC_PATH_PROGS(__DB_CONVERT, [${DBXY}_convert db_convert], db_convert,
$MYPATH)
+ AC_PATH_PROGS(__DB_DEADLOCK, [${DBXY}_deadlock db_deadlock],
db_deadlock, $MYPATH)
+ AC_PATH_PROGS(__DB_DUMP, [${DBXY}_dump db_dump], db_dump, $MYPATH)
+ AC_PATH_PROGS(__DB_HOTBACKUP, [${DBXY}_hotbackup db_hootbackup],
db_hotbackup, $MYPATH)
+ AC_PATH_PROGS(__DB_LOAD, [${DBXY}_load db_load], db_load, $MYPATH)
+ AC_PATH_PROGS(__DB_LOG_VERIFY, [${DBXY}_log_verify db_log_verify],
db_log_verify, $MYPATH)
+ AC_PATH_PROGS(__DB_PRINTLOG, [${DBXY}_printlog db_printlog],
db_printlog, $MYPATH)
+ AC_PATH_PROGS(__DB_RECOVER, [${DBXY}_recover db_recover], db_recover,
$MYPATH)
+ AC_PATH_PROGS(__DB_REPLICATE, [${DBXY}_replicate db_replicate],
db_replicate, $MYPATH)
+ AC_PATH_PROGS(__DBSQL, [${DBXY}sql dbsql], dbsql, $MYPATH)
+ AC_PATH_PROGS(__DB_SQL_CODEGEN, [${DBXY}_sql_codegen db_sql_codegen],
db_sql_codegen, $MYPATH)
+ AC_PATH_PROGS(__DB_STAT, [${DBXY}_stat db_stat], db_stat, $MYPATH)
+ AC_PATH_PROGS(__DB_TUNER, [${DBXY}_tuner db_tuner], db_tuner, $MYPATH)
+ AC_PATH_PROGS(__DB_UPGRADE, [${DBXY}_upgrade db_upgrade], db_upgrade,
$MYPATH)
+ AC_PATH_PROGS(__DB_VERIFY, [${DBXY}_verify db_verify], db_verify,
$MYPATH)
+
if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
AC_DEFINE(HAVE_DB_H, 1, [Have <db.h> header])
else
@@ -3646,14 +3652,21 @@
[ DBLIBSRCS="$DBLIBSRCS sqlite.c" ],
[])
-dnl # Sqlite 3.8.3.1 from db-6.1.19
+dnl # Sqlite from Berkeley DB
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
- [db_sql-6.2], [sqlite3_open], [dbsql.h],
+ [db_sql-6.2 db_sql-6.1 db_sql-6.0 db_sql-5.3 db_sql-5.2],
[sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite
library])
+
+ DBSQLXY=$(echo $LIBS | sed -e 's,.*-ldb_sql-\([[0-9]]\)\.\([[0-9]]\)
.*,db\1\2,p' -ed)
+ if test ".$DBSQLXY" != . ; then
+ $(echo "$CPPFLAGS" | grep -- "-I$includedir/$DBSQLXY">/dev/null) || \
+ CPPFLAGS="-I${includedir}/$DBSQLXY $CPPFLAGS"
+ fi
+
if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
WITH_DB_CPPFLAGS="${WITH_DB_CPPFLAGS}
-I\$(top_srcdir)/db/sql/generated"
WITH_DB_LIBS="${WITH_DBSQL_LIBS}"
@@ -3874,6 +3887,15 @@
[tcl8.6 tcl8.5 tcl], [Tcl_CreateInterp], [tcl.h],
[no,external:none], [],
[
+ AC_CHECK_FUNCS(Tcl_CreateInterp)
+ AC_CHECK_FUNCS(Tcl_DeleteInterp)
+ AC_CHECK_FUNCS(Tcl_Eval)
+ AC_CHECK_FUNCS(Tcl_EvalFile)
+ AC_CHECK_FUNCS(Tcl_GetStdChannel)
+ AC_CHECK_FUNCS(Tcl_Merge)
+ AC_CHECK_FUNCS(Tcl_SetChannelOption)
+ AC_CHECK_FUNCS(Tcl_SetVar)
+ AC_CHECK_FUNCS(Tcl_StackChannel)
], [])
AC_SUBST(WITH_TCL_SUBDIR)
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.112 -r2.365.2.113 devtool.conf
--- rpm/devtool.conf 29 Dec 2016 21:52:49 -0000 2.365.2.112
+++ rpm/devtool.conf 16 Jul 2017 04:20:02 -0000 2.365.2.113
@@ -3,7 +3,7 @@
##
%common
- MODULE_NAMES="beecrypt gpsee libgit2 libtpm lua neon pcre perl-URPM popt
syck gnulib"
+ MODULE_NAMES="beecrypt brotli flatcc gnulib gpsee libgit2 libtpm lua lz4
lzfse 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=""
@@ -24,9 +24,83 @@
MODULE_TAG_XZ=""
## https://github.com/OpenMandrivaSoftware/perl-URPM
+## https://github.com/dvidelabs/flatcc.git
+## https://github.com/facebook/zstd.git
+## https://github.com/lz4/lz4.git
+## https://github.com/google/brotli.git
+## https://github.com/google/snappy
+## https://github.com/lzfse/lzfse.git
+## https://github.com/andikleen/snappy-c.git
+
%checkout
for name in $MODULE_NAMES "$@"; do
case "${name}" in
+ lzfse)
+ if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
+ cmd="git pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ else
+ cmd="git clone git://github.com/lzfse/lzfse.git ${name}"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
+ fi
+ ;;
+ snappy)
+ if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
+ cmd="git pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ else
+ cmd="git clone git://github.com/google/snappy ${name}"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
+ fi
+ ;;
+ brotli)
+ if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
+ cmd="git pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ else
+ cmd="git clone git://github.com/google/brotli.git ${name}"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
+ fi
+ ;;
+ lz4)
+ if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
+ cmd="git pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ else
+ cmd="git clone git://github.com/lz4/lz4.git ${name}"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
+ fi
+ ;;
+ zstd)
+ if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
+ cmd="git pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ else
+ cmd="git clone git://github.com/facebook/zstd.git ${name}"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
+ fi
+ ;;
+ flatcc)
+ if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
+ cmd="git pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ else
+ cmd="git clone git://github.com/dvidelabs/flatcc.git ${name}"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
+ fi
+ ;;
gnulib)
if [ -d ${DEVTOOL_SRCDIR}/.${name}/.git ]; then
cmd="git pull"
@@ -897,7 +971,8 @@
# CPPFLAGS="-Wno-unused-command-line-argument -Wno-array-bounds
-Wno-parentheses-equality -Wno-string-compare"
# export CPPFLAGS
# -- java
- JAVA_HOME="/usr/java/jdk1.8.0_112"
+ JAVA_HOME="/usr/java/jdk1.8.0_131"
+ #JAVA_HOME="/usr/java/jdk1.8.0_112"
#JAVA_HOME="/usr/java/jdk1.8.0_102"
#JAVA_HOME="/usr/java/jdk1.8.0_92"
#JAVA_HOME="/usr/java/jdk1.8.0_77"
@@ -912,15 +987,14 @@
%autogen
%configure \
--verbose \
- --prefix=/usr \
- --libdir=/usr/lib64 \
- --with-path-versioned \
- --with-db \
+ --prefix=/opt/local \
+ --with-db=/usr/lib64:/usr/include/db62 \
--without-dbsql \
--without-db-tools-integrated \
--with-zlib \
--with-bzip2 \
--with-xz \
+ --with-zstd \
--with-file \
--with-path-magic=/usr/share/file/magic \
--with-lua=internal \
@@ -954,6 +1028,8 @@
--with-uuid=system \
--with-attr \
--with-acl \
+ --with-cap=yes \
+ --with-capng=no \
--without-xar \
--with-popt=internal \
--with-keyutils \
@@ -965,6 +1041,10 @@
--without-nix \
--without-bash \
--without-rc \
+ --with-mq=no \
+ --with-libicu=no \
+ --with-libffi=no \
+ --with-mozjs=no \
--without-js \
--without-gpsee \
--with-python \
@@ -976,11 +1056,11 @@
--with-mruby \
--with-yaml \
--with-jvm=$JAVA_HOME \
- --with-selinux \
- --with-sepol \
- --with-semanage \
+ --with-selinux=no \
+ --with-sepol=no \
+ --with-semanage=no \
--with-libgit2 \
- --with-apr \
+ --with-apr=system \
--with-subversion \
--with-unixodbc \
--with-squirrel \
@@ -1085,6 +1165,118 @@
# --enable-build-sanitize-undefined \
#
+#
+# CentOS7
+# --enable-build-gcov
+# --enable-build-sanitize-address
+# --with-libtpm=/usr/lib64:/usr/include/libtpm
+%ji
+ CC=gcc
+ export CC
+ CXX=g++
+ export CXX
+ JAVA_HOME="/usr/java/jdk1.8.0_131"
+ #JAVA_HOME="/usr/java/jdk1.8.0_112"
+ #JAVA_HOME="/usr/java/jdk1.8.0_102"
+ #JAVA_HOME="/usr/java/jdk1.8.0_31"
+ #JAVA_HOME="/usr/java/jdk1.7.0_03"
+ export JAVA_HOME
+ %autogen
+ %configure \
+ --verbose \
+ --prefix=/opt/local \
+ --with-db=/usr/lib64:/usr/include/db62 \
+ --without-dbsql \
+ --without-db-tools-integrated \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-zstd \
+ --with-file \
+ --with-path-magic=/usr/share/file/magic \
+ --with-lua=internal \
+ --with-tcl \
+ --with-sqlite \
+ --with-syck=internal \
+ --with-readline \
+ --with-augeas \
+ --with-beecrypt=internal \
+ --with-java \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
+ --with-tomcrypt \
+ --with-libtpm=internal \
+ --with-libtasn1 \
+ --without-pakchois \
+ --without-gnutls \
+ --with-paho=no \
+ --with-mosquitto=no \
+ --with-rabbitmq=no \
+ --without-proton \
+ --with-zeromq=no \
+ --with-neon=internal \
+ --enable-threadsafe-ssl \
+ --with-ssl=openssl \
+ --with-libproxy \
+ --with-expat \
+ --with-pcre=internal \
+ --enable-utf \
+ --with-uuid=system \
+ --with-attr \
+ --with-acl \
+ --with-cap=yes \
+ --with-capng=no \
+ --without-xar \
+ --with-popt=internal \
+ --with-keyutils \
+ --with-pthreads \
+ --with-libelf \
+ --without-cudf \
+ --without-ficl \
+ --without-aterm \
+ --without-nix \
+ --without-bash \
+ --without-rc \
+ --with-mq=no \
+ --with-libicu=no \
+ --with-libffi=no \
+ --with-mozjs=no \
+ --without-js \
+ --without-gpsee \
+ --with-python \
+ --with-pythonembed=/usr/lib64:/usr/include/python2.7 \
+ --with-perl \
+ --with-perl-urpm \
+ --with-perlembed=/usr/lib64/perl5/CORE:/usr/lib64/perl5/CORE \
+ --with-ruby \
+ --with-mruby \
+ --with-yaml \
+ --with-jvm=$JAVA_HOME \
+ --with-selinux=no \
+ --with-sepol=no \
+ --with-semanage=no \
+ --with-libgit2 \
+ --with-apr=system \
+ --with-subversion \
+ --with-unixodbc \
+ --with-squirrel \
+ --with-flatbuffers=no \
+ --with-build-extlibdep \
+ --with-build-maxextlibdep \
+ --with-valgrind \
+ --enable-openmp \
+ --enable-build-sanitize-address \
+ --enable-build-pic \
+ --enable-build-versionscript \
+ --enable-build-warnings \
+ --enable-build-debug \
+ --enable-maintainer-mode
+
+# --enable-build-gcov \
+# --enable-build-sanitize-address \
+#
+
# Momonga 7
%momonga
%autogen
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
