diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2019-01-25 15:34:17 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-01-25 15:47:34 +0100 |
| commit | 79b63b3ecbf9298268529709d1129d11a230ebe8 (patch) | |
| tree | 284ffd24fe94ff12e16bd564f90991cd881bc65c /sys-libs/db/files | |
| parent | package.mask: Masked =sys-libs/db-18.1* (diff) | |
| download | gentoo-79b63b3ecbf9298268529709d1129d11a230ebe8.tar.gz gentoo-79b63b3ecbf9298268529709d1129d11a230ebe8.tar.bz2 gentoo-79b63b3ecbf9298268529709d1129d11a230ebe8.zip | |
sys-libs/db: Bump to version 18.1.25
Closes: https://bugs.gentoo.org/675202
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
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 |
2 files changed, 49 insertions, 0 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. |