From 5f13c36bdd3ceec666f2b37d7bdbf3216083112f Mon Sep 17 00:00:00 2001
From: Benjamin Schieder <blindcoder@scavenger.homeip.net>
Date: Mon, 18 Sep 2006 12:34:55 +0000
Subject: [PATCH] Benjamin Schieder: 	fix bdb42 for x86_64 builds. 	Note
 that this will need base/ed to be built before bdb 	I leave that to the
 reference builder :-)

[2006070511014224014] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7914 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/bdb/bdb.conf                    |  7 +++++++
 package/base/bdb/ld_version_check.diff_bdb42 | 21 ++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 package/base/bdb/ld_version_check.diff_bdb42

diff --git a/package/base/bdb/bdb.conf b/package/base/bdb/bdb.conf
index d179f312f..959ccbd22 100644
--- a/package/base/bdb/bdb.conf
+++ b/package/base/bdb/bdb.conf
@@ -89,6 +89,13 @@ else
 	fi
 fi
 
+if [ $xpkg = bdb42 ] ; then
+	if [ "${ROCKCFG_X86_BITS}" = "64" ] ; then
+		var_append patchfiles ' ' "$base/package/base/bdb/ld_version_check.diff_bdb42"
+		hook_add preconf 3 "cd ${builddir}/db-${ver}/dist; ./s_config; cd -"
+	fi
+fi
+
 # adding -pthread switch so we don't end up with dangling symbol references
 var_append GCC_WRAPPER_INSERT ' ' '-pthread'
 
diff --git a/package/base/bdb/ld_version_check.diff_bdb42 b/package/base/bdb/ld_version_check.diff_bdb42
new file mode 100644
index 000000000..7d6e0c6c7
--- /dev/null
+++ b/package/base/bdb/ld_version_check.diff_bdb42
@@ -0,0 +1,21 @@
+diff -pruN db-4.2.52-orig/dist/aclocal/libtool.ac db-4.2.52/dist/aclocal/libtool.ac
+--- db-4.2.52-orig/dist/aclocal/libtool.ac	2006-07-05 08:26:26.000000000 +0000
++++ db-4.2.52/dist/aclocal/libtool.ac	2006-07-05 08:27:37.000000000 +0000
+@@ -1988,7 +1988,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+       # but apparently some GNU ld's only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      case `$lt_cv_path_LD -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+ 	test "$with_gnu_ld" != no && break
+ 	;;
+@@ -2700,7 +2700,7 @@ if test "$GXX" = yes; then
+     # linker, instead of GNU ld.  If possible, this setting should
+     # overridden to take advantage of the native linker features on
+     # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists