From da91d22828916a0f143655591939c4cd3d98bd6a Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Thu, 29 Jul 2010 18:12:08 +0200
Subject: [PATCH] glibc: fixed to create a proper ld.so.conf for 64 bit
 architectures

---
 base/glibc/glibc.conf | 56 ++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index 9f435c606..87a71167e 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -163,33 +163,39 @@ glibc_postmake()
 
 	# Install ld.so.conf
 	#
-	if [ "$SDECFG_MULTILIB" == 1 ] ; then
-		cat > $root/etc/ld.so.conf <<-EOT
-		/lib64
-		/lib32
-		/lib
-		/usr/lib64
-		/usr/lib32
-		/usr/lib
-		/usr/*/lib64
-		/usr/*/lib32
-		/usr/*/lib
-		/opt/*/lib64
-		/opt/*/lib32
-		/opt/*/lib
-		/usr/local/lib64
-		/usr/local/lib32
-		/usr/local/lib
+	case $arch_machine in
+		powerpc64|sparc64|x86_64|mips64)
+			cat > $root/etc/ld.so.conf <<-EOT
+			/lib64
+			/lib
+			/usr/lib64
+			/usr/lib
+			/usr/*/lib64
+			/usr/*/lib
+			/opt/*/lib64
+			/opt/*/lib
+			/usr/local/lib64
+			/usr/local/lib
 EOT
-	else
-		cat > $root/etc/ld.so.conf <<-EOT
-		/lib
-		/usr/lib
-		/usr/*/lib
-		/opt/*/lib
-		/usr/local/lib
+			if [ "$SDECFG_MULTILIB" == 1 ] ; then
+				cat >> $root/etc/ld.so.conf <<-EOT
+				/lib32
+				/usr/lib32
+				/usr/*/lib32
+				/opt/*/lib32
+				/usr/local/lib32
 EOT
-	fi
+			fi
+			;;
+		*)	cat > $root/etc/ld.so.conf <<-EOT
+			/lib
+			/usr/lib
+			/usr/*/lib
+			/opt/*/lib
+			/usr/local/lib
+EOT
+		;;
+	esac
 
 	# Move 'ldconfig' and 'sln' binaries
 	#