lidb-multiarch.patch

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>

diff --git a/dist/aclocal/sequence.m4 b/dist/aclocal/sequence.m4
index 6e99b93..c2f0109 100644 (file)
--- a/dist/aclocal/sequence.m4
+++ b/dist/aclocal/sequence.m4
@@ -78,7 +78,7 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [
        fi
        if test "$db_cv_build_sequence" = "yes"; then
                AC_SUBST(db_seq_decl)
-               db_seq_decl="typedef $db_cv_seq_type db_seq_t;";
+               db_seq_decl="typedef int64_t db_seq_t;";
 
                AC_DEFINE(HAVE_64BIT_TYPES)
                AH_TEMPLATE(HAVE_64BIT_TYPES,

diff --git a/packaging/libdb-multiarch.patch b/packaging/libdb-multiarch.patch
deleted file mode 100644 (file)
index f0e6ff6..0000000
--- a/packaging/libdb-multiarch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up db-5.3.15/dist/aclocal/sequence.m4.multiarch db-5.3.15/dist/aclocal/sequence.m4
---- db-5.3.15/dist/aclocal/sequence.m4.multiarch       2010-06-25 17:50:36.000000000 +0200
-+++ db-5.3.15/dist/aclocal/sequence.m4 2011-12-20 02:00:49.000000000 +0100
-@@ -78,7 +78,7 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [
-       fi
-       if test "$db_cv_build_sequence" = "yes"; then
-               AC_SUBST(db_seq_decl)
--              db_seq_decl="typedef $db_cv_seq_type db_seq_t;";
-+              db_seq_decl="typedef int64_t db_seq_t;";
- 
-               AC_DEFINE(HAVE_64BIT_TYPES)
-               AH_TEMPLATE(HAVE_64BIT_TYPES,

diff --git a/packaging/libdb.spec b/packaging/libdb.spec
index 5cb3a27..250ae5e 100644 (file)
--- a/packaging/libdb.spec
+++ b/packaging/libdb.spec
@@ -6,7 +6,6 @@ Name: libdb
 Version: 5.3.21
 Release: 11
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
-Patch0: libdb-multiarch.patch
 # db-1.85 upstream patches
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
@@ -189,7 +188,6 @@ for building programs which use the Berkeley DB in Java.
 %prep
 %setup -q -n db-%{version}
 
-%patch0 -p1 -b .multiarch
 pushd db.1.85/PORT/linux
 %patch10 -p0 -b .1.1
 popd