diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
| commit | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (patch) | |
| tree | c34bf820c2809fb7e08ed5564df2a25cf759516f /sys-libs/db/files | |
| parent | 693cc9b6e847a01c1bb692153021aaf9fb0fab25 (diff) | |
gentoo resync 31.01.2019
Diffstat (limited to 'sys-libs/db/files')
| -rw-r--r-- | sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch | 11 | ||||
| -rw-r--r-- | sys-libs/db/files/db-18.1.25-test-link.patch | 38 | ||||
| -rw-r--r-- | sys-libs/db/files/db-4.3-listen-to-java-options.patch | 4 |
3 files changed, 51 insertions, 2 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..40570cafe210 --- /dev/null +++ b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch @@ -0,0 +1,11 @@ +--- db-18.1.25/dist/aclocal/sql.m4 ++++ db-18.1.25/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 new file mode 100644 index 000000000000..dc3d8ae93c5a --- /dev/null +++ b/sys-libs/db/files/db-18.1.25-test-link.patch @@ -0,0 +1,38 @@ +--- db-18.1.25/test/tcl/parallel.tcl ++++ db-18.1.25/test/tcl/parallel.tcl +@@ -296,17 +296,26 @@ + [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \ + $destdir/$buildpath} + } ++ catch { ++ set l [eval glob {$dir/.libs} {$dir/db_{checkpoint,deadlock}$EXE} \ ++ {$dir/db_{dump,load,printlog,recover,stat,upgrade}$EXE} \ ++ {$dir/db_{archive,verify,hotbackup,log_verify}$EXE}] ++ foreach fn $l { ++ set fbasename [file tail $fn] ++ eval file link {$destdir/$fbasename} $fn ++ } ++ } ++ # we will be modifying this file, so we must copy, not link + catch {eval file copy \ +- [eval glob {$dir/{.libs,include.tcl}}] $destdir} ++ [eval glob {$dir/include.tcl}] $destdir} + # catch {eval file copy $dir/$queuedir $destdir} +- catch {eval file copy \ +- [eval glob {$dir/db_{checkpoint,deadlock}$EXE} \ +- {$dir/db_{dump,load,printlog,recover}$EXE} \ +- {$dir/db_{stat,upgrade,archive,verify}$EXE} \ +- {$dir/db_{hotbackup,log_verify,tuner}$EXE}] \ +- $destdir} +- catch {eval file copy \ +- [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] $destdir} ++ catch { ++ set l [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] ++ foreach fn $l { ++ set fbasename [file tail $fn] ++ eval file link {$destdir/$fbasename} $fn ++ } ++ } + + # Create modified copies of include.tcl in parallel + # directories so paths still work. diff --git a/sys-libs/db/files/db-4.3-listen-to-java-options.patch b/sys-libs/db/files/db-4.3-listen-to-java-options.patch index 8ddb46b70261..f1f701de1261 100644 --- a/sys-libs/db/files/db-4.3-listen-to-java-options.patch +++ b/sys-libs/db/files/db-4.3-listen-to-java-options.patch @@ -1,5 +1,5 @@ ---- dist/configure.ac 2005-09-23 21:01:26.000000000 +0200 -+++ dist/configure.ac 2005-09-23 20:59:20.000000000 +0200 +--- a/dist/configure.ac ++++ b/dist/configure.ac @@ -385,6 +385,7 @@ # A classpath that includes . is needed to check for Java CLASSPATH=".:$CLASSPATH" |