sys-libs/db: cleanup patches

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2022-03-20 20:48:23 +00:00
parent 0bc178c7a0
commit 7649b930ec
No known key found for this signature in database
GPG Key ID: F4922810EEA0483B
13 changed files with 16 additions and 22 deletions

View File

@ -81,7 +81,7 @@ src_prepare() {
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4 || die
AT_M4DIR="aclocal" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
# They do autoconf and THEN replace the version variables :(
. ./RELEASE
for v in \
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \

View File

@ -67,7 +67,7 @@ src_prepare() {
AT_M4DIR="aclocal" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
# They do autoconf and THEN replace the version variables :(
. ./RELEASE
sed \
-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \

View File

@ -85,7 +85,7 @@ src_prepare() {
AT_M4DIR="aclocal" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
# They do autoconf and THEN replace the version variables :(
. ./RELEASE
local v ev
for v in \

View File

@ -83,7 +83,7 @@ src_prepare() {
AT_M4DIR="aclocal" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
# They do autoconf and THEN replace the version variables :(
. ./RELEASE
local v ev
for v in \

View File

@ -82,7 +82,7 @@ src_prepare() {
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4 || die
AT_M4DIR="aclocal" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
# They do autoconf and THEN replace the version variables :(
. ./RELEASE
for v in \
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \

View File

@ -85,7 +85,7 @@ src_prepare() {
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4 || die
AT_M4DIR="aclocal" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
# They do autoconf and THEN replace the version variables :(
. ./RELEASE
for v in \
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \

View File

@ -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}

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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}

View File

@ -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"

View File

@ -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"