rpms/guile/devel guile-1.6.7-64bit.patch, NONE, 1.1 guile.spec, 1.30, 1.31 guile-1.6.7-x86_64.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: pknirsch

Update of /cvs/dist/rpms/guile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7464

Modified Files:
	guile.spec 
Added Files:
	guile-1.6.7-64bit.patch 
Removed Files:
	guile-1.6.7-x86_64.patch 
Log Message:
- Extended the fix to s390x.


guile-1.6.7-64bit.patch:
 configure |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE guile-1.6.7-64bit.patch ---
--- guile-1.6.4/configure.lib64 2005-06-09 12:34:40.486511382 -0700
+++ guile-1.6.4/configure       2005-06-09 12:49:59.772813211 -0700
@@ -6876,6 +6876,13 @@ linux-gnu*)
   # before this can be enabled.
   hardcode_into_libs=yes

+  case $host_cpu in
+  x86_64|s390x)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,


Index: guile.spec
===================================================================
RCS file: /cvs/dist/rpms/guile/devel/guile.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- guile.spec	2 Sep 2005 10:09:59 -0000	1.30
+++ guile.spec	2 Sep 2005 10:15:25 -0000	1.31
@@ -11,7 +11,7 @@
 Patch2: guile-1.6.0-unknown_arch.patch
 Patch3: guile-1.6.0-ppc64.patch
 Patch4: guile-1.6.7-ltdl.patch
-Patch5: guile-1.6.7-x86_64.patch
+Patch5: guile-1.6.7-64bit.patch
 License: GPL
 Group: Development/Languages
 Buildroot: %{_tmppath}/%{name}-root
@@ -50,7 +50,7 @@
 %patch2 -p1 -b .unknown_arch
 %patch3 -p1 -b .ppc64
 %patch4 -p1 -b .ltdl
-%patch5 -p1 -b .x86_64
+%patch5 -p1 -b .64bit
 
 %build
 
@@ -176,7 +176,7 @@
 
 %changelog
 * Fri Sep 02 2005 Phil Knirsch <pknirsch at redhat.com> 5:1.6.7-4
-- Fix dynamic linking on x86_64 (#159971)
+- Fix dynamic linking on 64bit archs (#159971)
 
 * Wed Mar 02 2005 Phil Knirsch <pknirsch at redhat.com> 5:1.6.7-2
 - bump release and rebuild with gcc 4


--- guile-1.6.7-x86_64.patch DELETED ---