Accepting request 229281 from devel:ARM:Factory

- update to 2.17: * PPC segement alignment restrictions can be disabled * Added Aarch64 support * Allow compiler overrides for 64 and 32 bit builds * hugeadm now handles /etc/mtab being a simlink properly * ppc64 fixes - remove libhugetlbfs.ia64-libdir.patch: ia64 is no longer supported by openSUSE - add ignore-perl-modules.diff: do not install perl modules, unused and are installed in the wrong place to be found anyway - add ARM support - add disable-rw-on-non-ldscripts.diff: Skip rw tests - Do not install tests anymore OBS-URL: https://build.opensuse.org/request/show/229281 OBS-URL: https://build.opensuse.org/package/show/Base:System/libhugetlbfs?expand=0&rev=37
2014-04-09 09:58:06 +00:00 · 2014-04-09 09:58:06 +00:00 · 25f7cb99ec
commit 25f7cb99ec
parent 538cdfab50
9 changed files with 94 additions and 80 deletions
--- a/disable-rw-on-non-ldscripts.diff
+++ b/disable-rw-on-non-ldscripts.diff
@ -0,0 +1,20 @@
+--- tests/Makefile
+++ tests/Makefile
+@@ -46,7 +46,7 @@
+ TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_TESTS:%=xB.%) \
+ 	$(HUGELINK_TESTS:%=xBDT.%) $(HUGELINK_RW_TESTS)
+ else
+-TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_RW_TESTS)
+TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS)
+ endif
+ 
+ else
+@@ -55,7 +55,7 @@
+ TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_TESTS:%=xB.%) \
+ 	$(HUGELINK_TESTS:%=xBDT.%)
+ else
+-TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_RW_TESTS)
+TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS)
+ endif
+ 
+ endif
--- a/ignore-perl-modules.diff
+++ b/ignore-perl-modules.diff
@ -0,0 +1,14 @@
+We don't need them, and they're not installed in a directory
+where they can be found anyway..
+
+--- Makefile
+++ Makefile
+@@ -442,7 +442,7 @@
+ 	for x in $(INSTALL_BIN); do \
+ 		$(INSTALL) -m 755 $(BIN_OBJ_DIR)/$$x $(DESTDIR)$(EXEDIR); done
+ 
+-install-stat: install-perlmod
+install-stat:
+ 	@$(VECHO) INSTALL_SCRIPT $(DESTDIR)$(EXEDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(EXEDIR)
+ 	for x in $(INSTALL_SCRIPT); do \
--- a/libhugetlbfs-2.16.tar.gz
+++ b/libhugetlbfs-2.16.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a473ebc70e80d8c452f359b05bc45d1fb87e6e2425d216c06486e30acf86ed2
-size 178982
--- a/libhugetlbfs-2.17.tar.gz
+++ b/libhugetlbfs-2.17.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ef1dd19ebeefe2cefaf8bdbc40400dbfb9b3c546a7e4cf2ab0cdf381ff7fe93
+size 180829
--- a/libhugetlbfs-ppc64le.patch
+++ b/libhugetlbfs-ppc64le.patch
@ -3,34 +3,32 @@ Add ppc64le support
 Signed-off-by: Anton Blanchard <anton@samba.org>
 ---

-diff --git a/Makefile b/Makefile
-index 48205af..7919c3b 100644
--- a/Makefile
-+++ b/Makefile
-@@ -46,6 +46,11 @@ CC32 = gcc -m32
+Index: libhugetlbfs-2.17/Makefile
+===================================================================
+--- libhugetlbfs-2.17.orig/Makefile
+++ libhugetlbfs-2.17/Makefile
+@@ -46,6 +46,11 @@ ifneq ($(BUILDTYPE),NATIVEONLY)
+ CC32 = $(CC) -m32
 ELF32 = elf32ppclinux
 endif
- else
+else
 +ifeq ($(ARCH),ppc64le)
-+CC64 = gcc -m64
+CC64 = $(CC) -m64
 +ELF64 = elf64lppc
 +TMPLIB64 = lib64
-+else
- ifeq ($(ARCH),ppc)
- CC32 = gcc -m32
- ELF32 = elf32ppclinux
-@@ -100,6 +105,7 @@ endif
+ else
+ ifeq ($(ARCH),powerpc)
+ CC32 = $(CC) -m32
+@@ -106,6 +110,7 @@ $(error "Unrecognized architecture ($(AR
 endif
 endif
 endif
 +endif
- 
- ifdef CC32
- OBJDIRS += obj32
-diff --git a/contrib/tlbmiss_cost.sh b/contrib/tlbmiss_cost.sh
-index 1f1e234..8fbf798 100755
--- a/contrib/tlbmiss_cost.sh
-+++ b/contrib/tlbmiss_cost.sh
+ endif
+ endif
+ endif
+--- libhugetlbfs-2.17.orig/contrib/tlbmiss_cost.sh
+++ libhugetlbfs-2.17/contrib/tlbmiss_cost.sh
@@ -44,7 +44,7 @@ cpumhz() {
 	FNAME="cpu MHz"
 	FINDEX=4
--- a/libhugetlbfs.changes
+++ b/libhugetlbfs.changes
@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Mar 26 12:37:06 UTC 2014 - dmueller@suse.com
+
+- update to 2.17:
+ * PPC segement alignment restrictions can be disabled
+ * Added Aarch64 support
+ * Allow compiler overrides for 64 and 32 bit builds
+ * hugeadm now handles /etc/mtab being a simlink properly
+
+  * ppc64 fixes
+- remove libhugetlbfs.ia64-libdir.patch:
+  ia64 is no longer supported by openSUSE
+- add ignore-perl-modules.diff: do not install perl modules, unused
+  and are installed in the wrong place to be found anyway
+- add ARM support
+- add disable-rw-on-non-ldscripts.diff: Skip rw tests
+- Do not install tests anymore
+
 -------------------------------------------------------------------
 Tue Feb 11 08:09:11 UTC 2014 - trenn@suse.de

--- a/libhugetlbfs.ia64-libdir.patch
+++ b/libhugetlbfs.ia64-libdir.patch
@ -1,17 +0,0 @@
---
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libhugetlbfs-2.5/Makefile
-===================================================================
--- libhugetlbfs-2.5.orig/Makefile
-+++ libhugetlbfs-2.5/Makefile
-@@ -64,7 +64,7 @@ endif
- else
- ifeq ($(ARCH),ia64)
- CC64 = gcc
-TMPLIB64 = lib64
-+TMPLIB64 = lib
- CFLAGS += -DNO_ELFLINK
- else
- ifeq ($(ARCH),sparc64)
--- a/libhugetlbfs.s390.patch
+++ b/libhugetlbfs.s390.patch
@ -2,38 +2,34 @@
 Makefile |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

-Index: libhugetlbfs-2.15/Makefile
+Index: libhugetlbfs-2.17/Makefile
 ===================================================================
--- libhugetlbfs-2.15.orig/Makefile
-+++ libhugetlbfs-2.15/Makefile
-@@ -69,19 +69,22 @@ else
+--- libhugetlbfs-2.17.orig/Makefile
+++ libhugetlbfs-2.17/Makefile
+@@ -82,12 +82,12 @@ else
 ifeq ($(ARCH),ia64)
- CC64 = gcc
- TMPLIB64 = lib
+ CC64 = $(CC)
+ TMPLIB64 = lib64
 -CFLAGS += -DNO_ELFLINK
 +CPPFLAGS += -DNO_ELFLINK
 else
 ifeq ($(ARCH),sparc64)
- CC64 = gcc -m64
+ CC64 = $(CC) -m64
 TMPLIB64 = lib64
 -CFLAGS += -DNO_ELFLINK
 +CPPFLAGS += -DNO_ELFLINK
 else
 ifeq ($(ARCH),s390x)
- CC64 = gcc -m64
-CC32 = gcc -m31
-ELF32 = elf_s390
- ELF64 = elf64_s390
- TMPLIB64 = lib64
-+CUSTOM_LDSCRIPTS = no
-+else
-+ifeq ($(ARCH),s390)
-+CC32 = gcc -m31
-+ELF32 = elf_s390
+ CC64 = $(CC) -m64
+@@ -98,10 +98,15 @@ TMPLIB64 = lib64
 TMPLIB32 = lib
 CUSTOM_LDSCRIPTS = no
 else
-@@ -89,6 +92,7 @@ $(error "Unrecognized architecture ($(AR
+ifeq ($(ARCH),s390)
+CC32 = gcc -m31
+ELF32 = elf_s390
+else
+ $(error "Unrecognized architecture ($(ARCH))")
 endif
 endif
 endif
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@ -16,7 +16,6 @@
 #


-
 Name:           libhugetlbfs

 %if 0%{?suse_version} > 1140
@ -32,16 +31,13 @@ Group:          Development/Libraries/Other
 Obsoletes:      libhugetlbfs-64bit
 %endif
 #
-Version:        2.16
+Version:        2.17
 Release:        0
 Url:            http://libhugetlbfs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define my_make_flags V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" BUILDTYPE=NATIVEONLY PREFIX=/usr LIBDIR32=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
-Source0:        libhugetlbfs-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/project/libhugetlbfs/libhugetlbfs/%{version}/libhugetlbfs-%{version}.tar.gz
 Source1:        baselibs.conf
-# Sources have no support for arm (and they depend on the architecture)
-ExcludeArch:    %arm
-Patch1:         libhugetlbfs.ia64-libdir.patch
 Patch2:         libhugetlbfs.s390.patch
 Patch4:         libhugetlbfs.tests-malloc.patch
 Patch7:         libhugetlbfs_ia64_fix_missing_test.patch
@ -50,6 +46,8 @@ Patch9:         libhugetlbfs-ppc64le.patch
 Patch10:        libhugetlbfs.ppc64le.step2.patch
 Patch11:        libhugetlbfs.ppc64le.step3.patch
 Patch12:        libhugetlbfs.ppc64le.step4.patch
+Patch13:        ignore-perl-modules.diff
+Patch14:        disable-rw-on-non-ldscripts.diff

 %description
 The libhugetlbfs package interacts with the Linux hugetlbfs to
@ -65,7 +63,6 @@ Devel package, header and static library, of libhugetlb

 %prep
 %setup -q
-%patch1 -p1
 %patch2 -p1
 %patch4 -p1
 %patch7 -p1
@ -74,26 +71,22 @@ Devel package, header and static library, of libhugetlb
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13
+%patch14

 %build
 make %{my_make_flags}

 %install
-tests=install-tests
-make %{my_make_flags} install $tests
+make %{my_make_flags} install
 make \
 %ifarch sparc sparcv9
 	CC32="gcc" CC64="" NATIVEONLY=1 \
 %endif
-	%{my_make_flags} install $tests
+	%{my_make_flags} install
 mkdir -p $RPM_BUILD_ROOT/usr/include
 cp -avL hugetlbfs.h $RPM_BUILD_ROOT/usr/include
 chmod 644 $RPM_BUILD_ROOT%{_libdir}/*.a
-for file in $RPM_BUILD_ROOT/%_libdir/libhugetlbfs/tests/*/*; do
-  strip $file || :
-done
-# Do not pack in a 268MB file..
-rm $RPM_BUILD_ROOT/%_libdir/libhugetlbfs/tests/obj32/linkhuge_rw || :

 %clean
 rm -rf $RPM_BUILD_ROOT
@ -106,14 +99,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*.gz
 %{_libdir}/libhugetlbfs_privutils.so
 %{_libdir}/libhugetlbfs.so
-%dir %{_libdir}/libhugetlbfs
-%{_libdir}/libhugetlbfs/*
-# ToDo: What are these for...
-%dir /usr/lib/perl5/TLBC
-/usr/lib/perl5/TLBC/DataCollect.pm
-/usr/lib/perl5/TLBC/OpCollect.pm
-/usr/lib/perl5/TLBC/Report.pm
-/usr/lib/perl5/TLBC/PerfCollect.pm

 %files libhugetlb-devel
 %defattr(-, root, root)