commit libhugetlbfs for openSUSE:Factory
Hello community, here is the log from the commit of package libhugetlbfs for openSUSE:Factory checked in at 2015-11-08 11:26:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libhugetlbfs (Old) and /work/SRC/openSUSE:Factory/.libhugetlbfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libhugetlbfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libhugetlbfs/libhugetlbfs.changes 2015-06-30 10:16:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libhugetlbfs.new/libhugetlbfs.changes 2015-11-08 11:27:05.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 6 13:10:03 UTC 2015 - fvogt@suse.com + +- Add zero_filesize_segment.patch to fix testcase on s390x +- Fixes bnc#919680 +- Patches already included mainline and now deleted: +D libhugetlbfs-2.18-restrict-is-a-reserved-word.patch +D fix_plt_extrasz_always_returning_0_on_ppc64le.patch + +------------------------------------------------------------------- +Fri Nov 6 12:01:55 UTC 2015 - fvogt@suse.com + +- Latest version from git next branch + +------------------------------------------------------------------- Old: ---- fix_plt_extrasz_always_returning_0_on_ppc64le.patch libhugetlbfs-2.18-restrict-is-a-reserved-word.patch libhugetlbfs-2.18.tar.gz New: ---- _service libhugetlbfs-2.18.99.tar.xz zero_filesize_segment.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libhugetlbfs.spec ++++++ --- /var/tmp/diff_new_pack.ucqUua/_old 2015-11-08 11:27:06.000000000 +0100 +++ /var/tmp/diff_new_pack.ucqUua/_new 2015-11-08 11:27:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libhugetlbfs # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,27 +16,15 @@ # +%define my_make_flags V=1 CFLAGS="%{optflags} -fPIC" BUILDTYPE=NATIVEONLY PREFIX=%{_prefix} LIBDIR32=%{_libdir} DESTDIR=%{buildroot} Name: libhugetlbfs - -%if 0%{?suse_version} > 1140 -BuildRequires: glibc-devel-static -%endif -BuildRequires: doxygen - +Version: 2.18.99 +Release: 0 Summary: Hugetlbfs helper library License: LGPL-2.1+ Group: Development/Libraries/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libhugetlbfs-64bit -%endif -# -Version: 2.18 -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: http://downloads.sourceforge.net/project/libhugetlbfs/libhugetlbfs/%{version}/libhugetlbfs-%{version}.tar.gz +Url: https://github.com/libhugetlbfs/libhugetlbfs +Source0: %{name}-%{version}.tar.xz Source1: baselibs.conf Patch2: libhugetlbfs.s390.patch Patch4: libhugetlbfs.tests-malloc.patch @@ -44,22 +32,34 @@ Patch8: libhugetlbfs_fix_tests.patch Patch13: ignore-perl-modules.diff Patch14: disable-rw-on-non-ldscripts.diff -Patch15: fix_plt_extrasz_always_returning_0_on_ppc64le.patch -# PATCH-FIX-UPSTREAM libhugetlbfs-2.18-restrict-is-a-reserved-word.patch -- Fix compilation with GCC 5 (and C99/C11 in general) -Patch16: libhugetlbfs-2.18-restrict-is-a-reserved-word.patch +Patch15: zero_filesize_segment.patch +BuildRequires: doxygen +BuildRequires: glibc-devel-static +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bug437293 +%ifarch ppc64 +Obsoletes: libhugetlbfs-64bit +%endif %description The libhugetlbfs package interacts with the Linux hugetlbfs to make large pages available to applications in a transparent manner. -%package libhugetlb-devel +%package devel Summary: Devel package for libhugetlb Group: Development/Libraries/Other Requires: libhugetlbfs -%description libhugetlb-devel +%description devel Devel package, header and static library, of libhugetlb +%package tests +Summary: Tests for package libhugetlb +Group: Development/Libraries/Other + +%description tests +The testsuite for libhugetlb. Binaries can be found in %{_libdir}/libhugetlbfs/tests + %prep %setup -q %patch2 -p1 @@ -69,37 +69,36 @@ %patch13 %patch14 %patch15 -p1 -%patch16 -p1 %build +echo %{version} > version make %{my_make_flags} %install make %{my_make_flags} install -make \ -%ifarch sparc sparcv9 - CC32="gcc" CC64="" NATIVEONLY=1 \ -%endif - %{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 - -%clean -rm -rf $RPM_BUILD_ROOT +make %{my_make_flags} install-tests +mkdir -p %{buildroot}%{_prefix}/include +cp -avL hugetlbfs.h %{buildroot}%{_prefix}/include +chmod 644 %{buildroot}%{_libdir}/*.a +[ ! -f %{buildroot}%{_libdir}/libhugetlbfs/tests/obj64/dummy.ldscript ] || chmod -f a-x %{buildroot}%{_libdir}/libhugetlbfs/tests/obj64/dummy.ldscript %files %defattr(-, root, root) %doc LGPL-2.1 HOWTO README NEWS -/usr/share/libhugetlbfs -/usr/bin/* +%{_datadir}/libhugetlbfs +%{_bindir}/* %{_mandir}/man*/*.gz %{_libdir}/libhugetlbfs_privutils.so %{_libdir}/libhugetlbfs.so -%files libhugetlb-devel +%files devel %defattr(-, root, root) -/usr/include/hugetlbfs.h +%{_includedir}/hugetlbfs.h %{_libdir}/libhugetlbfs.a +%files tests +%defattr(-,root,root) +%dir %{_libdir}/libhugetlbfs +%{_libdir}/libhugetlbfs/* + %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">git://github.com/libhugetlbfs/libhugetlbfs.git</param> <param name="scm">git</param> <param name="filename">libhugetlbfs</param> <param name="version">2.18.99</param> <param name="revision">next</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled" /> </services> ++++++ zero_filesize_segment.patch ++++++ diff --git a/tests/Makefile b/tests/Makefile index e2e1156..4daa5d1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -39,6 +39,11 @@ LDLIBS = $(STATIC_LDLIBS) -ldl -lhugetlbfs_privutils LDFLAGS32 = -L../obj32 LDFLAGS64 = -L../obj64 INSTALL = install +ifeq ($(ARCH),s390x) +ARCH_SUFFIX = .s390x +else +ARCH_SUFFIX = +endif TESTS = $(LIB_TESTS) $(NOLIB_TESTS) $(STRESS_TESTS) dummy.ldscript ifdef ELF32 @@ -181,7 +186,7 @@ $(LDSCRIPT_TESTS:%=obj32/%): obj32/%: %.ld obj32/%.o obj32/testutils.o @$(VECHO) LD32 "(preload test)" $@ $(CC32) $(LDFLAGS) $(LDFLAGS32) -o $@ -Lobj32 $^ $(LDLIBS) || cp $(BADTOOLCHAIN) $@ -$(LDSCRIPT_TESTS:%=obj64/%): obj64/%: %.ld obj64/%.o obj64/testutils.o +$(LDSCRIPT_TESTS:%=obj64/%): obj64/%: %$(ARCH_SUFFIX).ld obj64/%.o obj64/testutils.o @$(VECHO) LD64 "(preload test)" $@ $(CC64) $(LDFLAGS) $(LDFLAGS64) -o $@ -Lobj64 $^ $(LDLIBS) || cp $(BADTOOLCHAIN) $@ diff --git a/tests/zero_filesize_segment.s390x.ld b/tests/zero_filesize_segment.s390x.ld new file mode 100644 index 0000000..813a92f --- /dev/null +++ b/tests/zero_filesize_segment.s390x.ld @@ -0,0 +1,7 @@ +SECTIONS +{ + .empty (0x90000000) : { + __empty_segment = .; + . = . + 4; + } +}
participants (1)
-
root@hilbert.suse.de