* [gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/
@ 2022-03-20 21:04 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-03-20 21:04 UTC (permalink / raw
To: gentoo-commits
commit: a4d649f7f7c12797f2f063752b0c4ae4d3892de1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 21:00:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 21:04:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d649f7
sys-libs/db: restore SQLite patch for 18.1.32
... and tidied up.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/24687
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/
@ 2023-01-14 19:17 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-01-14 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 69cfcf33d6be8d80c19a9aabbf2d7317d1062ccc
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jan 10 16:34:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 19:15:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cfcf33
sys-libs/db: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29051
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/db-18.1.25-sqlite-configure-path.patch | 11 -------
sys-libs/db/files/db-18.1.25-test-link.patch | 38 ----------------------
sys-libs/db/files/db-18.1.40-fix-docs.patch | 19 -----------
.../db/files/db-6.1.19-sqlite-configure-path.patch | 10 ------
.../db/files/db-6.2.38-bashism-configure.patch | 11 -------
5 files changed, 89 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
deleted file mode 100644
index 83fe2d66765e..000000000000
--- a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 5fb6d5fae7e9..000000000000
--- a/sys-libs/db/files/db-18.1.25-test-link.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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}
- }
-+ 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-18.1.40-fix-docs.patch b/sys-libs/db/files/db-18.1.40-fix-docs.patch
deleted file mode 100644
index 7bed9f1cbca0..000000000000
--- a/sys-libs/db/files/db-18.1.40-fix-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes
-
- cp: cannot stat 'bdb-sql': No such file or directory
- cp: cannot stat 'gsg_db_server': No such file or directory
-
---- a/dist/Makefile.in
-+++ b/dist/Makefile.in
-@@ -1299,8 +1299,8 @@ uninstall_utilities:
-
- # We install csharp docs even on UNIX so we don't have a
- # broken link on the landing page.
--DOCLIST=api_reference articles bdb-sql collections csharp gsg \
-- gsg_db_rep gsg_db_server gsg_txn index.html installation \
-+DOCLIST=api_reference articles collections csharp gsg \
-+ gsg_db_rep gsg_txn index.html installation \
- java license porting programmer_reference upgrading
-
- install_docs:
-
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
deleted file mode 100644
index 103e3302bdc9..000000000000
--- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
- 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 " && 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 " && cat build_config.h >> config.h) || exit 1
-
- # Configure JDBC if --enable-jdbc
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
deleted file mode 100644
index bea1f3d3bde0..000000000000
--- a/sys-libs/db/files/db-6.2.38-bashism-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-14 19:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-14 19:17 [gentoo-commits] repo/gentoo:master commit in: sys-libs/db/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-03-20 21:04 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox