Accepting request 905308 from home:trenn:branches:Base:System

- Enhance _service magic
- Update to version 2.23.0.g6b126a4:
  * Wait child with os.wait()
  * Makefile: add MANDIR variable
  * Makefile: skip LIB resolve check if NATIVEONLY
  * Introduce basic riscv64 support
  * ld.hugetlbfs: fix -Ttext-segment argument on AArch64
- Remove unsupported arch patch (does not patch clean anymore):
D libhugetlbfs.s390.patch

OBS-URL: https://build.opensuse.org/request/show/905308
OBS-URL: https://build.opensuse.org/package/show/Base:System/libhugetlbfs?expand=0&rev=60
This commit is contained in:
Thomas Renninger 2021-07-13 04:31:38 +00:00 committed by Git OBS Bridge
parent 4badc303c9
commit 62ff476ec9
8 changed files with 38 additions and 63 deletions

View File

@ -1,14 +1,16 @@
<services>
<service name="tar_scm" mode="disabled">
<service name="obs_scm" mode="localonly">
<param name="url">git://github.com/libhugetlbfs/libhugetlbfs.git</param>
<param name="scm">git</param>
<param name="filename">libhugetlbfs</param>
<param name="version">2.21</param>
<param name="revision">2.21</param>
<param name="revision">HEAD</param>
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.g%h</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<service name="set_version" mode="localonly"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
<param name="compression">gz</param>
</service>
<service name="set_version" mode="disabled" />
</services>

View File

@ -1,7 +1,7 @@
Index: tests/Makefile
===================================================================
--- tests/Makefile.orig
+++ tests/Makefile
--- a/tests/Makefile.orig
+++ b/tests/Makefile
@@ -48,7 +48,7 @@ ifeq ($(CUSTOM_LDSCRIPTS),yes)
TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_TESTS:%=xB.%) \
$(HUGELINK_TESTS:%=xBDT.%) $(HUGELINK_RW_TESTS)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94dca9ea2c527cd77bf28904094fe4708865a85122d416bfccc8f4b73b9a6785
size 174012

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:147797bb090e82c1076337832a3ca86686ed8f528690c5dea46e5cd60c3cff16
size 772108

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jul 09 13:18:00 UTC 2021 - trenn@suse.de
- Enhance _service magic
- Update to version 2.23.0.g6b126a4:
* Wait child with os.wait()
* Makefile: add MANDIR variable
* Makefile: skip LIB resolve check if NATIVEONLY
* Introduce basic riscv64 support
* ld.hugetlbfs: fix -Ttext-segment argument on AArch64
- Remove unsupported arch patch (does not patch clean anymore):
D libhugetlbfs.s390.patch
-------------------------------------------------------------------
Wed Apr 21 12:36:14 UTC 2021 - Wolfgang Frisch <wolfgang.frisch@suse.com>

5
libhugetlbfs.obsinfo Normal file
View File

@ -0,0 +1,5 @@
name: libhugetlbfs
version: 2.23.0.g6b126a4
mtime: 1599498497
commit: 6b126a4d7da9490fa40fe7e1b962edcb939feddc

View File

@ -1,39 +0,0 @@
---
Makefile | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
Index: libhugetlbfs-2.21/Makefile
===================================================================
--- libhugetlbfs-2.21.orig/Makefile
+++ libhugetlbfs-2.21/Makefile
@@ -87,12 +87,12 @@ else
ifeq ($(ARCH),ia64)
CC64 = $(CC)
TMPLIB64 = lib64
-CFLAGS += -DNO_ELFLINK
+CPPFLAGS += -DNO_ELFLINK
else
ifeq ($(ARCH),sparc64)
CC64 = $(CC) -m64
TMPLIB64 = lib64
-CFLAGS += -DNO_ELFLINK
+CPPFLAGS += -DNO_ELFLINK
else
ifeq ($(ARCH),s390x)
CC64 = $(CC) -m64
@@ -111,10 +111,15 @@ ELF32 = elf_s390
TMPLIB32 = lib
CUSTOM_LDSCRIPTS = no
else
+ifeq ($(ARCH),s390)
+CC32 = gcc -m31
+ELF32 = elf_s390
+else
$(error "Unrecognized architecture ($(ARCH))")
endif
endif
endif
+endif
endif
endif
endif

View File

@ -18,7 +18,7 @@
%define my_make_flags V=1 CFLAGS="%{optflags} -fPIC" LDFLAGS="-pie" BUILDTYPE=NATIVEONLY PREFIX=%{_prefix} LIBDIR32=%{_libdir} DESTDIR=%{buildroot}
Name: libhugetlbfs
Version: 2.22
Version: 2.23.0.g6b126a4
Release: 0
Summary: Helper library for the Huge Translation Lookaside Buffer Filesystem
License: LGPL-2.1-or-later
@ -26,11 +26,10 @@ Group: System/Libraries
URL: https://github.com/libhugetlbfs/libhugetlbfs
Source0: https://github.com/libhugetlbfs/libhugetlbfs/releases/download/%{version}/libhugetlbfs-%{version}.tar.gz
Source1: baselibs.conf
Patch2: libhugetlbfs.s390.patch
Patch4: libhugetlbfs.tests-malloc.patch
Patch7: libhugetlbfs_ia64_fix_missing_test.patch
Patch14: disable-rw-on-non-ldscripts.diff
Patch15: zero_filesize_segment.patch
Patch0: libhugetlbfs.tests-malloc.patch
Patch1: libhugetlbfs_ia64_fix_missing_test.patch
Patch2: disable-rw-on-non-ldscripts.diff
Patch3: zero_filesize_segment.patch
BuildRequires: doxygen
BuildRequires: glibc-devel-static
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -60,12 +59,7 @@ The testsuite for libhugetlbfs. Binaries can be found in
%{_libdir}/libhugetlbfs/tests.
%prep
%setup -q
%patch2 -p1
%patch4 -p1
%patch7 -p1
%patch14
%patch15 -p1
%autosetup -p1
%build
echo %{version} > version