commit ab77c05acdd4fcfaf8b3e66afa56f1e4526ba5e9
Author: Kyle McMartin <kyle at mcmartin.ca>
Date: Wed Jan 29 13:15:25 2014 -0500
libhugetlbfs: update to upstream 2.17
libhugetlbfs-2.17-ppc.patch | 12 ++++++++++++
...2.16-s390.patch => libhugetlbfs-2.17-s390.patch | 15 +++++++--------
libhugetlbfs.spec | 15 +++++++++++----
sources | 2 +-
4 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/libhugetlbfs-2.17-ppc.patch b/libhugetlbfs-2.17-ppc.patch
new file mode 100644
index 0000000..5afee04
--- /dev/null
+++ b/libhugetlbfs-2.17-ppc.patch
@@ -0,0 +1,12 @@
+diff -Nur libhugetlbfs-2.17/Makefile libhugetlbfs-2.17.new/Makefile
+--- libhugetlbfs-2.17/Makefile 2014-01-29 12:26:51.843696237 -0500
++++ libhugetlbfs-2.17.new/Makefile 2014-01-29 12:26:15.462508174 -0500
+@@ -32,7 +32,7 @@
+ CFLAGS += -Wall -fPIC
+ CPPFLAGS += -D__LIBHUGETLBFS__ -DPPC_NO_SEGMENTS
+
+-ARCH = $(shell uname -m | sed -e s/i.86/i386/)
++ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc64/powerpc64/ -e s/ppc/powerpc/)
+ CC = gcc
+
+ CUSTOM_LDSCRIPTS = yes
diff --git a/libhugetlbfs-2.16-s390.patch b/libhugetlbfs-2.17-s390.patch
similarity index 54%
rename from libhugetlbfs-2.16-s390.patch
rename to libhugetlbfs-2.17-s390.patch
index 1523468..c794404 100644
--- a/libhugetlbfs-2.16-s390.patch
+++ b/libhugetlbfs-2.17-s390.patch
@@ -1,23 +1,22 @@
-diff -up libhugetlbfs-2.16/Makefile.s390 libhugetlbfs-2.16/Makefile
---- libhugetlbfs-2.16/Makefile.s390 2013-05-12 08:49:28.160883455 +0200
-+++ libhugetlbfs-2.16/Makefile 2013-05-12 08:49:39.586906994 +0200
-@@ -84,17 +84,26 @@ CFLAGS += -DNO_ELFLINK
+--- libhugetlbfs-2.17/Makefile 2013-10-21 21:07:56.000000000 -0400
++++ libhugetlbfs-2.17.new/Makefile 2014-01-29 12:11:42.716386433 -0500
+@@ -91,17 +91,26 @@
else
ifeq ($(ARCH),s390x)
- CC64 = gcc -m64
--CC32 = gcc -m31
+ CC64 = $(CC) -m64
+-CC32 = $(CC) -m31
-ELF32 = elf_s390
ELF64 = elf64_s390
TMPLIB64 = lib64
TMPLIB32 = lib
CUSTOM_LDSCRIPTS = no
+ifneq ($(BUILDTYPE),NATIVEONLY)
-+CC32 = gcc -m31
++CC32 = $(CC) -m31
+ELF32 = elf_s390
+endif
+else
+ifeq ($(ARCH),s390)
-+CC32 = gcc -m31
++CC32 = $(CC) -m31
+ELF32 = elf_s390
+TMPLIB32 = lib
+CUSTOM_LDSCRIPTS = no
diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec
index 0a6e169..ee543b5 100644
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@@ -1,13 +1,14 @@
Name: libhugetlbfs
-Version: 2.16
-Release: 2%{?dist}
+Version: 2.17
+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.16-s390.patch
+Patch0: libhugetlbfs-2.17-s390.patch
+Patch1: libhugetlbfs-2.17-ppc.patch
BuildRequires: glibc-devel
BuildRequires: glibc-static
@@ -42,6 +43,7 @@ pool size control. pagesize lists page sizes available on the machine.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .s390
+%patch1 -p1 -b .ppc
%build
# Parallel builds are not reliable
@@ -100,9 +102,14 @@ rm -fr $RPM_BUILD_ROOT/%{_sbindir}/
%{_mandir}/man1/pagesize.1.gz
%{_mandir}/man1/ld.hugetlbfs.1.gz
%exclude %{_mandir}/man8/cpupcstat.8.gz
-%exclude /usr/lib/perl5/TLBC
+%exclude %{_libdir}/perl5/TLBC
%changelog
+* Wed Jan 29 2014 Kyle McMartin <kyle at fedoraproject.org> - 2.17-1
+- Update for upstream 2.17 release (adds AArch64 support)
+- update libhugetlbfs-2.16-s390.patch for 2.17 changes to Makefile
+- add libhugetlbfs-2.17-ppc.patch to fix powerpc{,64}
+
* Thu Jul 25 2013 Dan Horák <dan[at]danny.cz> - 2.16-2
- Fix build on s390/s390x (patch by aarapov at rh.c)
- Use Fedora CFLAGS for build
diff --git a/sources b/sources
index fcf6151..1fa3464 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70666447c81f4fb484fee94e40b1ea69 libhugetlbfs-2.16.tar.gz
+247044f8fab48003ba622db6fd9e33ea libhugetlbfs-2.17.tar.gz