diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
commit | 401101f9c8077911929d3f2b60a37098460a5d89 (patch) | |
tree | c2bef4719f6787550f0916aeaa8f4f403a9296af /sys-libs/db/files | |
parent | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff) |
gentoo resync : 25.03.2022
Diffstat (limited to 'sys-libs/db/files')
14 files changed, 32 insertions, 150 deletions
diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch new file mode 100644 index 000000000000..83fe2d66765e --- /dev/null +++ b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch @@ -0,0 +1,11 @@ +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 +@@ -99,7 +99,7 @@ + if test "$db_cv_debug" = "yes"; then + CPPFLAGS="$CPPFLAGS -g" + fi +-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 ++(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 + + # Configure JDBC if --enable-jdbc + if test "$db_cv_jdbc" != "no"; then diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch b/sys-libs/db/files/db-18.1.25-test-link.patch index dc3d8ae93c5a..5fb6d5fae7e9 100644 --- a/sys-libs/db/files/db-18.1.25-test-link.patch +++ b/sys-libs/db/files/db-18.1.25-test-link.patch @@ -1,5 +1,5 @@ ---- db-18.1.25/test/tcl/parallel.tcl -+++ db-18.1.25/test/tcl/parallel.tcl +--- a/test/tcl/parallel.tcl ++++ b/test/tcl/parallel.tcl @@ -296,17 +296,26 @@ [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \ $destdir/$buildpath} diff --git a/sys-libs/db/files/db-4.2-listen-to-java-options.patch b/sys-libs/db/files/db-4.2-listen-to-java-options.patch deleted file mode 100644 index f1f701de1261..000000000000 --- a/sys-libs/db/files/db-4.2-listen-to-java-options.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/dist/configure.ac -+++ b/dist/configure.ac -@@ -385,6 +385,7 @@ - # A classpath that includes . is needed to check for Java - CLASSPATH=".:$CLASSPATH" - export CLASSPATH -+ AC_JAVA_OPTIONS - AC_PROG_JAVAC - AC_PROG_JAR - AC_PROG_JAVA diff --git a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch deleted file mode 100644 index a0b2800d1286..000000000000 --- a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ b/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,14 +43,19 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- _JINC="$_JTOPDIR/Headers";; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ _JINC="$_JTOPDIR/Headers";; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch b/sys-libs/db/files/db-4.8.24-java-manifest-location.patch deleted file mode 100644 index 9cebadc52064..000000000000 --- a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar db-4.8.24.orig/dist/Makefile.in db-4.8.24/dist/Makefile.in ---- db-4.8.24.orig/dist/Makefile.in 2009-09-19 23:39:45.286001896 +0000 -+++ db-4.8.24/dist/Makefile.in 2009-09-19 23:41:13.079326882 +0000 -@@ -830,7 +830,7 @@ - $(JAVA) -classpath $(JAVA_CLASSTOP) \ - com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP) - cd $(JAVA_CLASSTOP) && \ -- $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat -+ $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat - - $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS) - @test -d $(JAVA_EXCLASSTOP) || \ diff --git a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch index c53160a82970..99a26e15fbfb 100644 --- a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch +++ b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch @@ -1,5 +1,3 @@ -diff --git a/dbinc/atomic.h b/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 --- a/dbinc/atomic.h +++ b/dbinc/atomic.h @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; diff --git a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch index ad3da2786c88..252a6213b30f 100644 --- a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch +++ b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch @@ -1,5 +1,3 @@ -diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 --- a/src/dbinc/atomic.h +++ b/src/dbinc/atomic.h @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; diff --git a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch index ff7abbe1fd79..cfbe2a7ffd01 100644 --- a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch @@ -1,6 +1,5 @@ -diff -Nuar db-5.2.28.orig//dist/aclocal/sql.m4 db-5.2.28//dist/aclocal/sql.m4 ---- db-5.2.28.orig//dist/aclocal/sql.m4 2011-06-10 09:50:45.000000000 -0700 -+++ db-5.2.28//dist/aclocal/sql.m4 2011-07-15 17:02:54.646521189 -0700 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -91,7 +91,7 @@ # !!! END COPIED from autoconf distribution diff --git a/sys-libs/db/files/db-6.0.20-test-link.patch b/sys-libs/db/files/db-6.0.20-test-link.patch index 8aceaa4d6f8c..5fc6669465c6 100644 --- a/sys-libs/db/files/db-6.0.20-test-link.patch +++ b/sys-libs/db/files/db-6.0.20-test-link.patch @@ -1,6 +1,5 @@ -diff -Nuar db-6.0.20.orig/test/tcl/parallel.tcl db-6.0.20/test/tcl/parallel.tcl ---- db-6.0.20.orig/test/tcl/parallel.tcl 2013-07-04 15:49:43.408348040 +0000 -+++ db-6.0.20/test/tcl/parallel.tcl 2013-07-04 17:40:07.147943377 +0000 +--- a/test/tcl/parallel.tcl ++++ b/test/tcl/parallel.tcl @@ -289,16 +289,26 @@ [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \ $destdir/$buildpath} diff --git a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch index c239bb118a82..66bdcf9fe130 100644 --- a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch @@ -1,5 +1,5 @@ ---- db-6.0.35/dist/aclocal/sql.m4 -+++ db-6.0.35/dist/aclocal/sql.m4 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -96,7 +96,7 @@ if test "$db_cv_build_cryptography" = "yes"; then CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" diff --git a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch index 25854c53e160..103e3302bdc9 100644 --- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch @@ -1,5 +1,5 @@ ---- db-6.1.19/dist/aclocal/sql.m4 -+++ db-6.1.19/dist/aclocal/sql.m4 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -96,6 +96,6 @@ if test "$db_cv_build_cryptography" = "yes"; then CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" diff --git a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch deleted file mode 100644 index 963b01380c23..000000000000 --- a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,18 +43,23 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- if test -d "$_JTOPDIR/include"; then -- _JINC="$_JTOPDIR/include" -- else -- _JINC="$_JTOPDIR/Headers" -- fi;; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ if test -d "$_JTOPDIR/include"; then -+ _JINC="$_JTOPDIR/include" -+ else -+ _JINC="$_JTOPDIR/Headers" -+ fi;; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch deleted file mode 100644 index 0a320d7f9336..000000000000 --- a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,21 +43,26 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- if test -d "$_JTOPDIR/include"; then -- _JINC="$_JTOPDIR/include" -- else -- _JINC="`$_JTOPDIR/Commands/java_home`/include" -- fi;; -- *) if test ! -r "$_JTOPDIR/include/jni.h"; then -- _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- fi -- _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ if test -d "$_JTOPDIR/include"; then -+ _JINC="$_JTOPDIR/include" -+ else -+ _JINC="`$_JTOPDIR/Commands/java_home`/include" -+ fi;; -+ *) if test ! -r "$_JTOPDIR/include/jni.h"; then -+ _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ fi -+ _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-6.2.38-bashism-configure.patch b/sys-libs/db/files/db-6.2.38-bashism-configure.patch new file mode 100644 index 000000000000..bea1f3d3bde0 --- /dev/null +++ b/sys-libs/db/files/db-6.2.38-bashism-configure.patch @@ -0,0 +1,11 @@ +--- a/dist/aclocal/types.m4 ++++ b/dist/aclocal/types.m4 +@@ -188,7 +188,7 @@ AC_SUBST(db_off_t_decl) + AC_CHECK_TYPE(db_off_t,, + [AM_SEARCH_SSIZES(db_off_t_decl, db_off_t, $ac_cv_sizeof_off_t)]) + AC_SUBST(db_off_t_max_decl) +-if test "$ac_cv_sizeof_off_t" == "4"; then ++if test "$ac_cv_sizeof_off_t" = "4"; then + db_off_t_max_decl="#define DB_OFF_T_MAX INT32_MAX" + else + db_off_t_max_decl="#define DB_OFF_T_MAX INT64_MAX" |