[libhugetlbfs/f15] fix build on s390 make build verbose, use Fedora CFLAGS

[Dan Horák]

commit 92b368235d513136d3a4c419b8466882d2672fd1
Author: Dan Horák <dan at danny.cz>
Date:   Fri Aug 5 10:50:04 2011 +0200

    fix build on s390
    make build verbose, use Fedora CFLAGS

 libhugetlbfs-2.12-s390x-build.patch |   30 ++++++++++++++++++++++++++++++
 libhugetlbfs-2.6-s390x-build.patch  |   17 -----------------
 libhugetlbfs.spec                   |   10 +++++++---
 3 files changed, 37 insertions(+), 20 deletions(-)
---
diff --git a/libhugetlbfs-2.12-s390x-build.patch b/libhugetlbfs-2.12-s390x-build.patch
new file mode 100644
index 0000000..91533b2
--- /dev/null
+++ b/libhugetlbfs-2.12-s390x-build.patch
@@ -0,0 +1,30 @@
+diff -up libhugetlbfs-2.12/Makefile.s390x-build libhugetlbfs-2.12/Makefile
+--- libhugetlbfs-2.12/Makefile.s390x-build	2011-04-01 22:39:44.000000000 +0200
++++ libhugetlbfs-2.12/Makefile	2011-08-05 09:23:24.000000000 +0200
+@@ -75,10 +75,17 @@ 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
++ifeq ($(ARCH),s390)
++CC32 = gcc -m31
++TMPLIB32 = lib
++CFLAGS += -DNO_ELFLINK
+ else
+ $(error "Unrecognized architecture ($(ARCH))")
+ endif
+@@ -88,6 +95,7 @@ endif
+ endif
+ endif
+ endif
++endif
+ 
+ ifdef CC32
+ OBJDIRS += obj32
diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec
index db3bec8..33d9b20 100644
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@@ -1,13 +1,13 @@
 Name: libhugetlbfs
 Version: 2.12
-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: libhugetlbfs-2.6-s390x-build.patch
+Patch0: libhugetlbfs-2.12-s390x-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
@@ -47,7 +47,7 @@ pool size control. pagesize lists page sizes available on the machine.
 
 %build
 # Parallel builds are not reliable
-make BUILDTYPE=NATIVEONLY
+CFLAGS="%{optflags}" make BUILDTYPE=NATIVEONLY PREFIX=%{_prefix} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -105,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Fri Aug 05 2011 Dan Horák <dan[at]danny.cz> - 2.12-2
+- fix build on s390
+- make build verbose, use Fedora CFLAGS
+
 * Tue Jul 20 2011 Eric B Munson <emunson at mgebm.net>
  - Update for upstream 2.12 release