rpms/libhugetlbfs/devel libhugetlbfs-2.6-s390x-build.patch, NONE, 1.1 libhugetlbfs.spec, 1.30, 1.31 remove-s390-libhugetlbfs-2.4.patch, 1.1, NONE

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/libhugetlbfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31461

Modified Files:
	libhugetlbfs.spec 
Added Files:
	libhugetlbfs-2.6-s390x-build.patch 
Removed Files:
	remove-s390-libhugetlbfs-2.4.patch 
Log Message:
fix building on s390x


libhugetlbfs-2.6-s390x-build.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libhugetlbfs-2.6-s390x-build.patch ---
diff -up libhugetlbfs-2.6/Makefile.s390x-build libhugetlbfs-2.6/Makefile
--- libhugetlbfs-2.6/Makefile.s390x-build	2009-08-24 14:56:07.000000000 +0200
+++ libhugetlbfs-2.6/Makefile	2009-09-01 10:08:15.939516241 +0200
@@ -74,10 +74,12 @@ CFLAGS += -DNO_ELFLINK
 else
 ifeq ($(ARCH),s390x)
 CC64 = gcc -m64
-CC32 = gcc -m31
 TMPLIB64 = lib64
 TMPLIB32 = lib
 CFLAGS += -DNO_ELFLINK
+ifneq ($(BUILDTYPE),NATIVEONLY)
+CC32 = gcc -m31
+endif
 else
 $(error "Unrecognized architecture ($(ARCH))")
 endif


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/libhugetlbfs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libhugetlbfs.spec	31 Aug 2009 11:23:39 -0000	1.30
+++ libhugetlbfs.spec	3 Sep 2009 09:47:36 -0000	1.31
@@ -1,13 +1,13 @@
 Name: libhugetlbfs
 Version: 2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://libhugetlbfs.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
-Patch0: remove-s390-libhugetlbfs-2.4.patch
+Patch0: libhugetlbfs-2.6-s390x-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16
@@ -42,6 +42,7 @@ pool size control. pagesize lists page s
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .s390x-build
 
 %build
 # Parallel builds are not reliable
@@ -98,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Thu Sep 03 2009 Nils Philippsen <nils at redhat.com> 2.6-2
+- fix building on s390x
+
 * Mon Aug 31 2009 Eric Munson <ebmunson at us.ibm.com> 2.6-1
 - Updating for the libhugetlbfs-2.6 release
 


--- remove-s390-libhugetlbfs-2.4.patch DELETED ---