[libhugetlbfs] Update for 2.13 upstream release

Eric Munson emunson at fedoraproject.org
Sun Mar 25 02:16:18 UTC 2012


commit 37eabd856e2359e3fb830c544e72a88d0a0f82ea
Author: Eric B Munson <emunson at mgebm.net>
Date:   Sat Mar 24 22:16:04 2012 -0400

    Update for 2.13 upstream release

 .gitignore                          |    1 +
 libhugetlbfs-2.12-s390x-build.patch |   30 ------------------------------
 libhugetlbfs-2.13-s390x-build.patch |   17 +++++++++++++++++
 libhugetlbfs.spec                   |   16 ++++++----------
 sources                             |    2 +-
 5 files changed, 25 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a44848..8519694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libhugetlbfs-2.9.tar.gz
 /libhugetlbfs-2.12.tar.gz
+/libhugetlbfs-2.13.tar.gz
diff --git a/libhugetlbfs-2.13-s390x-build.patch b/libhugetlbfs-2.13-s390x-build.patch
new file mode 100644
index 0000000..82f1278
--- /dev/null
+++ b/libhugetlbfs-2.13-s390x-build.patch
@@ -0,0 +1,17 @@
+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
diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec
index be3a5d1..a13624a 100644
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@@ -1,13 +1,13 @@
 Name: libhugetlbfs
-Version: 2.12
-Release: 3%{?dist}
+Version: 2.13
+Release: 1%{?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.12-s390x-build.patch
+Patch0: libhugetlbfs-2.13-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
-CFLAGS="%{optflags}" make BUILDTYPE=NATIVEONLY PREFIX=%{_prefix} V=1
+make BUILDTYPE=NATIVEONLY
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -105,12 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Aug 05 2011 Dan HorĂ¡k <dan[at]danny.cz> - 2.12-2
-- fix build on s390
-- make build verbose, use Fedora CFLAGS
+* Sat Mar 24 2012 Eric B Munson <emunson at mgebm.net>
+ - Update for upstream 2.13 release
 
 * Tue Jul 20 2011 Eric B Munson <emunson at mgebm.net>
  - Update for upstream 2.12 release
diff --git a/sources b/sources
index 5073ee5..dd79145 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23c651e1f323fd4bf147b69790afe4ff  libhugetlbfs-2.12.tar.gz
+646ce121931b0bd38c19ad78b09f31cc  libhugetlbfs-2.13.tar.gz


More information about the scm-commits mailing list