patch.1.1

http://www.oracle.com/technetwork/products/berkeleydb/patch-082767.html

Problem: DB 1.85 compiles on Linux but fails to load, displaying an error
message that there's no lorder command.

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

diff --git a/db.1.85/PORT/linux/Makefile b/db.1.85/PORT/linux/Makefile
index 85b09a7..40b7c55 100644 (file)
--- a/db.1.85/PORT/linux/Makefile
+++ b/db.1.85/PORT/linux/Makefile
@@ -15,8 +15,7 @@ MISC= snprintf.o
 
 ${LIBDB}: ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC}
        rm -f $@
-       ar cq $@ \
-           `lorder ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC} | tsort`
+       ar cq $@ ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC}
        ranlib $@
 
 clean:

diff --git a/packaging/libdb.spec b/packaging/libdb.spec
index 250ae5e..c6315a6 100644 (file)
--- a/packaging/libdb.spec
+++ b/packaging/libdb.spec
@@ -7,7 +7,6 @@ Version: 5.3.21
 Release: 11
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 # 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
 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3
 Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.4
@@ -188,9 +187,6 @@ for building programs which use the Berkeley DB in Java.
 %prep
 %setup -q -n db-%{version}
 
-pushd db.1.85/PORT/linux
-%patch10 -p0 -b .1.1
-popd
 pushd db.1.85
 %patch11 -p0 -b .1.2
 %patch12 -p0 -b .1.3

diff --git a/packaging/patch.1.1 b/packaging/patch.1.1
deleted file mode 100644 (file)
index fe3177d..0000000
--- a/packaging/patch.1.1
+++ /dev/null
@@ -1,20 +0,0 @@
-*** Makefile.orig      Wed Jul 13 21:43:16 1994
---- Makefile   Wed Dec 31 19:00:00 1969
-***************
-*** 15,22 ****
-  
-  ${LIBDB}: ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC}
-       rm -f $@
-!      ar cq $@ \
-!          `lorder ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC} | tsort`
-       ranlib $@
-  
-  clean:
---- 15,21 ----
-  
-  ${LIBDB}: ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC}
-       rm -f $@
-!      ar cq $@ ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC}
-       ranlib $@
-  
-  clean: