[gentoo-commits] repo/gentoo:master commit in: sys-libs/libhugetlbfs/files/, profiles/, sys-libs/libhugetlbfs/
commit: cde90da0c3dbcad0d05466f1499b8991913f4850
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:31:49 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:32:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde90da0
sys-libs/libhugetlbfs: Remove last-rited pkg
Bug: https://bugs.gentoo.org/806079
Signed-off-by: Michał Górny gentoo.org>
profiles/package.mask | 6 -
sys-libs/libhugetlbfs/Manifest | 1 -
...fs-2.23-allow-building-against-glibc-2.34.patch | 258 -
.../files/libhugetlbfs-2.23-musl-ino_t-fix.patch | 13 --
.../files/libhugetlbfs-2.23-musl-nonnull-fix.patch | 31 ---
.../libhugetlbfs-2.23-musl-path-max-fix.patch | 22 --
.../libhugetlbfs-2.23-musl-sc-level2-fix.patch | 45
.../libhugetlbfs-2.23-uncompressed-man-pages.patch | 34 ---
.../files/libhugetlbfs-2.6-fixup-testsuite.patch | 31 ---
sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild | 175 --
sys-libs/libhugetlbfs/metadata.xml | 12 -
11 files changed, 628 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index bf8b22e2d9d0..d1d21c35d120 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -745,12 +745,6 @@ sci-chemistry/mdtraj
# Test failure in watchpoints.dem, undefined function FresnelC.
~sci-visualization/gnuplot-6.0.0
-# Michał Górny (2024-02-07)
-# Does not build anymore. Carries a large stack of patches already.
-# Last upstream activity in late 2020. No reverse dependencies left.
-# Removal on 2024-03-08. Bug #806079.
-sys-libs/libhugetlbfs
-
# Andrew Ammerlaan (2024-01-24)
# app-misc/ddcutil-2.1.0 causes core-dump crashes in
# kde-plasma/powerdevil[brightness-control].
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
deleted file mode 100644
index ffd498e94ecf..
--- a/sys-libs/libhugetlbfs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libhugetlbfs-2.23.tar.gz 175459 BLAKE2B
f469ff9a65364e9f0e04c11c8010c958855ebd4d50e1dd719576cda7c280586623404304be64a794907a5fb1d97bd9c0620a91d7a2492577e04fa40ff432b4c7
SHA512
fc9a7d59bcda9d3ca9c9e43a3a348f989c9cbdbbb77f21a43a06e71eacd05bbe5a7b2b51e20ae9ea00da9f1c4d1130da529bbfb702e8c9d11cab6efadd3dc168
diff --git
a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-allow-building-against-glibc-2.34.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-allow-building-against-glibc-2.34.patch
deleted file mode 100644
index 68e121e240ab..
---
a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-allow-building-against-glibc-2.34.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From 959d74fd0fbbff310943096e15024a84e8f5cba4 Mon Sep 17 00:00:00 2001
-From: Matheus Castanho
-Date: Thu, 12 Aug 2021 16:38:46 -0300
-Subject: [PATCH] Disable hugepage-backed malloc if __morecore is not available
-
-Starting with glibc 2.32, __morecore hook has been marked as deprecated, and
was
-completely removed on glibc 2.34, which causes an undefined symbol error during
-the build of libhugetlbfs.
-
-Greater changes are needed in order to keep providing the same functionality
-with future versions of glibc (see issue #52). Meanwhile, we can disable
-hugepage-backed malloc setup if __morecore is not available so users can at
-least keep using the other features provided by the library. Related tests are
-also conditionally disabled, and will show as SKIPPED if __morecore is not
-available.
-
-Tested on powerpc64le and x86_64 with glibc 2.34 and olders.
-
-Signed-off-by: Matheus Castanho
- Makefile | 6 +
- morecore.c | 8 ++
- tests/run_tests.py | 67 +++---
- 3 files changed, 71 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8b73523..35e53e7 100644
a/Makefile
-+++ b/Makefile
-@@ -192,6 +192,12 @@ endif
- endif
- endif
-
-+# glibc 2.34 removed __morecore, so it may not be available with recent
versions
-+HAS_MORECORE := $(shell /bin/echo -e '\#include \nvoid *
morecore_exists() { return &__morecore; }' | $(CC) -c -xc -o /dev/null - &>
/dev/null && /bin/echo yes || /bin/echo no)
-+ifeq ($(HAS_MORECORE),yes)
-+CFLAGS += -DHAS_MORECORE
-+endif
-+
- HEADERDIR = $(PREFIX)/include
- LIBDIR32 = $(PREFIX)/$(LIB32)
- LIBDIR64 = $(PREFIX)/$(LIB64)
-diff --git a/morecore.c b/morecore.c
-index 6563bbd..405c566 100644
a/morecore.c
-+++ b/morecore.c
-@@ -33,6 +33,13 @@
-
- #include "libhugetlbfs_internal.h"
-
-+#ifndef HAS_MORECORE
-+void hugetlbfs_setup_morecore(void)
-+{
-+ INFO("Not setting up morecore because it's not available (see issue
#52).\n");
-+}
-+#else
-+
- static int heap_fd;
-
- static void *heapbase;
-@@ -381,3 +388,4 @@ void hugetlbfs_setup_morecore(void)
-* to mmap() if we run out of hugepages. */
- mallopt(M_MMAP_MAX, 0);
- }
-+#endif /* HAS_MORECORE */
-diff --git a/tests/run_tests.py
[gentoo-commits] repo/gentoo:master commit in: sys-libs/libhugetlbfs/files/, sys-libs/libhugetlbfs/
commit: dbabd1516a53fa57ae0204216ae78741bd4928c9
Author: brahmajit das protonmail com>
AuthorDate: Sat Jul 23 18:47:48 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 1 02:04:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbabd151
sys-libs/libhugetlbfs: fix musl build errors
Fix _SC_LEVEL2_CACHE_LINESIZE undeclared and misc issues.
Patches for musl that mainly closes bug 828830, plus some other patches
for errors that come along 828830.
Closes: https://bugs.gentoo.org/828830
Closes: https://bugs.gentoo.org/832980
Signed-off-by: brahmajit das protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26539
Signed-off-by: Sam James gentoo.org>
.../files/libhugetlbfs-2.23-musl-ino_t-fix.patch | 13 +++
.../files/libhugetlbfs-2.23-musl-nonnull-fix.patch | 31 +++
.../libhugetlbfs-2.23-musl-path-max-fix.patch | 22 +++
.../libhugetlbfs-2.23-musl-sc-level2-fix.patch | 45 ++
sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild | 4 ++
5 files changed, 115 insertions(+)
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-ino_t-fix.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-ino_t-fix.patch
new file mode 100644
index ..f408f9fd6ac0
--- /dev/null
+++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-ino_t-fix.patch
@@ -0,0 +1,13 @@
+# Include dirent.h for ino_t
+# Fixes error: unknown typename 'ino_t'
+# Closes: https://bugs.gentoo.org/828830
+--- a/tests/hugetests.h
b/tests/hugetests.h
+@@ -22,6 +22,7 @@
+
+ #include
+ #include
++#include
+ #include
+
+ #include "libhugetlbfs_privutils.h"
diff --git
a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-nonnull-fix.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-nonnull-fix.patch
new file mode 100644
index ..5e3532e50877
--- /dev/null
+++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-nonnull-fix.patch
@@ -0,0 +1,31 @@
+# Use __nonnull only on glibc system
+# Closes: https://bugs.gentoo.org/832980
+--- a/shm.c
b/shm.c
+@@ -35,6 +35,12 @@
+ #endif
+
+ #ifdef HAVE_SHMGET_SYSCALL
++
++/* define __THROW to avoid build issue when it's not available from the libc
*/
++#ifndef __THROW
++#define __THROW
++#endif
++
+ /*
+ * The calls to dlsym() and dlerror() in the shmget() wrapper below force
+ * a dependency on libdl.so. This does not work for static executables
+@@ -48,8 +54,13 @@
+ * system shmget() may be performed without worry as there is no dynamic
+ * call chain.
+ */
++#ifdef __GLIBC__
+ extern void *dlsym (void *__restrict __handle, __const char *__restrict
__name)
+ __attribute__((weak)) __THROW __nonnull ((2));
++#else
++extern void *dlsym (void *__restrict __handle, __const char *__restrict
__name)
++ __attribute__((weak)) __THROW __attribute__((nonnull((2;
++#endif // __GLIBC__
+ extern char *dlerror (void) __attribute__((weak)) __THROW;
+
+
diff --git
a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-path-max-fix.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-path-max-fix.patch
new file mode 100644
index ..883bb3e98fc7
--- /dev/null
+++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-path-max-fix.patch
@@ -0,0 +1,22 @@
+# Include limits.h for PATH_MAX
+# Closes: https://bugs.gentoo.org/828830
+--- a/hugeadm.c
b/hugeadm.c
+@@ -33,6 +33,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include
+--- a/tests/gethugepagesizes.c
b/tests/gethugepagesizes.c
+@@ -27,6 +27,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
diff --git
a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-sc-level2-fix.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-sc-level2-fix.patch
new file mode 100644
index ..c42e017abec1
--- /dev/null
+++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-musl-sc-level2-fix.patch
@@ -0,0 +1,45 @@
+# _SC_LEVEL2_CACHE_LINESIZE is most probably Glibc specific define. Hence we
+# cannot use it with other libc's. Check if _SC_LEVEL2_CACHE_LINESIZE is
+# available or use custom function to get CPU cache size
+# Original patch was found here [1]
+# [1]:
https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
+# Closes: https://bugs.gentoo.org/828830
+--- a/alloc.c
b/alloc.c
+@@ -245,6 +245,24 @@ void free_huge_pages(void *ptr)
+ __free_huge_pages(ptr, 1);
+ }
+
++/*
++ * Avoid sysconf(_SC_LEVEL2_CACHE_LINESIZE) on linux
++ * Taken from the folling patch [1]
++ *
++ * [1]:
https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
++ */
++#if !defined(_SC_LEVEL2_CACHE_LINESIZE)
++static size_t get_cacheline_size() {
++ FILE * fp =
[gentoo-commits] repo/gentoo:master commit in: sys-libs/libhugetlbfs/files/, sys-libs/libhugetlbfs/
commit: ed5576e429fac992d5c039e5f2290cc2d5d8d6f4
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Nov 18 13:59:38 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Nov 18 13:59:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5576e4
sys-libs/libhugetlbfs: allow building against glibc-2.34
Bug: https://bugs.gentoo.org/806079
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
...fs-2.23-allow-building-against-glibc-2.34.patch | 258 +
sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild | 1 +
2 files changed, 259 insertions(+)
diff --git
a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-allow-building-against-glibc-2.34.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-allow-building-against-glibc-2.34.patch
new file mode 100644
index ..68e121e240ab
--- /dev/null
+++
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-allow-building-against-glibc-2.34.patch
@@ -0,0 +1,258 @@
+From 959d74fd0fbbff310943096e15024a84e8f5cba4 Mon Sep 17 00:00:00 2001
+From: Matheus Castanho
+Date: Thu, 12 Aug 2021 16:38:46 -0300
+Subject: [PATCH] Disable hugepage-backed malloc if __morecore is not available
+
+Starting with glibc 2.32, __morecore hook has been marked as deprecated, and
was
+completely removed on glibc 2.34, which causes an undefined symbol error during
+the build of libhugetlbfs.
+
+Greater changes are needed in order to keep providing the same functionality
+with future versions of glibc (see issue #52). Meanwhile, we can disable
+hugepage-backed malloc setup if __morecore is not available so users can at
+least keep using the other features provided by the library. Related tests are
+also conditionally disabled, and will show as SKIPPED if __morecore is not
+available.
+
+Tested on powerpc64le and x86_64 with glibc 2.34 and olders.
+
+Signed-off-by: Matheus Castanho
+---
+ Makefile | 6 +
+ morecore.c | 8 ++
+ tests/run_tests.py | 67 +++---
+ 3 files changed, 71 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8b73523..35e53e7 100644
+--- a/Makefile
b/Makefile
+@@ -192,6 +192,12 @@ endif
+ endif
+ endif
+
++# glibc 2.34 removed __morecore, so it may not be available with recent
versions
++HAS_MORECORE := $(shell /bin/echo -e '\#include \nvoid *
morecore_exists() { return &__morecore; }' | $(CC) -c -xc -o /dev/null - &>
/dev/null && /bin/echo yes || /bin/echo no)
++ifeq ($(HAS_MORECORE),yes)
++CFLAGS += -DHAS_MORECORE
++endif
++
+ HEADERDIR = $(PREFIX)/include
+ LIBDIR32 = $(PREFIX)/$(LIB32)
+ LIBDIR64 = $(PREFIX)/$(LIB64)
+diff --git a/morecore.c b/morecore.c
+index 6563bbd..405c566 100644
+--- a/morecore.c
b/morecore.c
+@@ -33,6 +33,13 @@
+
+ #include "libhugetlbfs_internal.h"
+
++#ifndef HAS_MORECORE
++void hugetlbfs_setup_morecore(void)
++{
++ INFO("Not setting up morecore because it's not available (see issue
#52).\n");
++}
++#else
++
+ static int heap_fd;
+
+ static void *heapbase;
+@@ -381,3 +388,4 @@ void hugetlbfs_setup_morecore(void)
+* to mmap() if we run out of hugepages. */
+ mallopt(M_MMAP_MAX, 0);
+ }
++#endif /* HAS_MORECORE */
+diff --git a/tests/run_tests.py b/tests/run_tests.py
+index 018264d..871d04d 100755
+--- a/tests/run_tests.py
b/tests/run_tests.py
+@@ -60,7 +60,7 @@ def snapshot_pool_state():
+ l.append((d, tuple(substate)))
+ return tuple(l)
+
+-def run_test_prog(bits, pagesize, cmd, **env):
++def run_test_prog(bits, pagesize, cmd, output='stdout', **env):
+ if paranoid_pool_check:
+ beforepool = snapshot_pool_state()
+ print("Pool state: %s" % str(beforepool))
+@@ -73,15 +73,17 @@ def run_test_prog(bits, pagesize, cmd, **env):
+ % (bits, bits, local_env.get("LD_LIBRARY_PATH", ""))
+ local_env["HUGETLB_DEFAULT_PAGE_SIZE"] = repr(pagesize)
+
++popen_args = {'env' : local_env, output : subprocess.PIPE}
++
+ try:
+-p = subprocess.Popen(cmd, env=local_env, stdout=subprocess.PIPE)
++p = subprocess.Popen(cmd, **popen_args)
+ rc = p.wait()
+ except KeyboardInterrupt:
+ # Abort and mark this a strange test result
+ return (None, "")
+ except OSError as e:
+ return (-e.errno, "")
+-out = p.stdout.read().decode().strip()
++out = getattr(p, output).read().decode().strip()
+
+ if paranoid_pool_check:
+ afterpool = snapshot_pool_state()
+@@ -309,6 +311,33 @@ def check_linkhuge_tests():
+ okbits.add(bits)
+ return okbits
+
++def check_morecore_disabled():
++"""
++Check if support for morecore is available.
++
++Newer glibc versions (>= 2.34) removed the __morecore malloc hook, so
tests
++relying on that functionality will not work as expected, and should be
++disabled.
++"""
++global morecore_disabled, wordsizes, pagesizes
++
++# Quick
[gentoo-commits] repo/gentoo:master commit in: sys-libs/libhugetlbfs/files/
commit: 2d58b63f8b08a94af2d27e0f447914355db3fefb
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Nov 14 15:16:27 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Nov 18 22:16:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d58b63f
sys-libs/libhugetlbfs: remove unused patches
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13652
Signed-off-by: Aaron Bauman gentoo.org>
.../files/libhugetlbfs-2.20-noexec-stack.patch | 135 -
.../files/libhugetlbfs-2.9-build.patch | 31 -
2 files changed, 166 deletions(-)
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch
deleted file mode 100644
index 04c8baee37b..000
--- a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-https://github.com/libhugetlbfs/libhugetlbfs/pull/9
-
-From 1c41d751d57a598919c40ab9c27514a98da93273 Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson"
-Date: Sat, 31 Oct 2009 07:59:57 +
-Subject: [PATCH] set noexec markers in the asm file directly
-
-Using -Wl,-z,noexecstack can hide real exec stack issues coming from other
-files, and is a bit unportable. Instead, set proper section markers in the
-assembly files directly. It also means people using the static libraries
-won't have to use -Wl,-z,noexecstack when they link their code.
- Makefile| 2 +-
- sys-aarch64elf.S| 4
- sys-armelf_linux_eabi.S | 4
- sys-elf32ppclinux.S | 4
- sys-elf64_s390.S| 4
- sys-elf64ppc.S | 4
- sys-elf_i386.S | 4
- sys-elf_s390.S | 4
- sys-elf_x86_64.S| 4
- 9 files changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 73ebad7..ca987d9 100644
a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@ NODEPTARGETS=
-
- INSTALL = install
-
--LDFLAGS += -Wl,-z,noexecstack -ldl
-+LDFLAGS += -ldl
- CFLAGS ?= -O2 -g
- CFLAGS += -Wall -fPIC
- CPPFLAGS += -D__LIBHUGETLBFS__
-diff --git a/sys-aarch64elf.S b/sys-aarch64elf.S
-index 54799d3..210558b 100644
a/sys-aarch64elf.S
-+++ b/sys-aarch64elf.S
-@@ -32,3 +32,7 @@ direct_syscall:
- mov x6, x7
- svc 0x0
- ret
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-armelf_linux_eabi.S b/sys-armelf_linux_eabi.S
-index dfa7407..265b75d 100644
a/sys-armelf_linux_eabi.S
-+++ b/sys-armelf_linux_eabi.S
-@@ -31,3 +31,7 @@ direct_syscall:
- swi 0x0
- ldmfd sp!, {r4, r5, r6, r7}
- bx lr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf32ppclinux.S b/sys-elf32ppclinux.S
-index 65d8b3f..6ba3f22 100644
a/sys-elf32ppclinux.S
-+++ b/sys-elf32ppclinux.S
-@@ -32,3 +32,7 @@ direct_syscall:
- mr 8,9
- sc
- blr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf64_s390.S b/sys-elf64_s390.S
-index 425a387..5c31899 100644
a/sys-elf64_s390.S
-+++ b/sys-elf64_s390.S
-@@ -20,3 +20,7 @@ direct_syscall:
- lgr %r5,%r6
- svc 0
- br %r14
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf64ppc.S b/sys-elf64ppc.S
-index d50f4a6..b57a345 100644
a/sys-elf64ppc.S
-+++ b/sys-elf64ppc.S
-@@ -46,3 +46,7 @@ direct_syscall:
- mr 8,9
- sc
- blr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf_i386.S b/sys-elf_i386.S
-index ab30c8d..6182b3d 100644
a/sys-elf_i386.S
-+++ b/sys-elf_i386.S
-@@ -40,3 +40,7 @@ direct_syscall:
- pop %edi
- pop %ebp
- ret
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf_s390.S b/sys-elf_s390.S
-index 40630d1..e6a9a96 100644
a/sys-elf_s390.S
-+++ b/sys-elf_s390.S
-@@ -20,3 +20,7 @@ direct_syscall:
- lr %r5,%r6
- svc 0
- br %r14
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf_x86_64.S b/sys-elf_x86_64.S
-index 6af06ad..561f49b 100644
a/sys-elf_x86_64.S
-+++ b/sys-elf_x86_64.S
-@@ -32,3 +32,7 @@ direct_syscall:
- mov 0x8(%rsp),%r9
- syscall
- retq
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
---
-2.6.2
-
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch
deleted file mode 100644
index 827e2a58d10..000
[gentoo-commits] repo/gentoo:master commit in: sys-libs/libhugetlbfs/files/, sys-libs/libhugetlbfs/
commit: c2625f810fa8b7c7ec3b51792a19c0608f5ef9b6
Author: Lars Wendler gentoo org>
AuthorDate: Wed Sep 19 09:36:50 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Sep 19 09:36:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2625f81
sys-libs/libhugetlbfs: Removed old.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
sys-libs/libhugetlbfs/Manifest | 2 -
.../files/libhugetlbfs-2.6-noexec-stack.patch | 44 --
sys-libs/libhugetlbfs/libhugetlbfs-2.18.ebuild | 146 --
sys-libs/libhugetlbfs/libhugetlbfs-2.19-r1.ebuild | 164 -
sys-libs/libhugetlbfs/libhugetlbfs-2.19.ebuild | 148 ---
5 files changed, 504 deletions(-)
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 2d7527a8693..580068e6d38 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,4 +1,2 @@
-DIST libhugetlbfs-2.18.tar.gz 181275 BLAKE2B
1f0ca8d73d9bdf05eb08706be4854f110b8cbe5b0c7554fdddb437fc9644e69d0bc42d9d8bedf23bf2dda4901977f093d0f46ed039304f8b5184b2fcac157d47
SHA512
6dcdbf571d6a723a40c15e10b24533f16d65f67fe149aa2d25bee48a034d003419d4cf4b6e55fcd385e1214fc4f6b4dda72ba429b9eea9b38be9b1a393528746
-DIST libhugetlbfs-2.19.tar.gz 181504 BLAKE2B
27d5e5729e48b82311d6f4317f8c0bb5a04054242bca6fd9745265e2590f18ec49de6a9cdfa7ea28be47f794e91e70c5fcecdb418bf8e8cb0cb5b78d0948e563
SHA512
d21781fe68736eb3bbafeb8f36f4f34d30f290f2f6744b52c1a40161caf2e28b823cd8e9b9c74ec4e6d11f7d398d909f80eb736cc39a64ecc7bf571018bfec7c
DIST libhugetlbfs-2.20.tar.gz 186750 BLAKE2B
758482a41254d6d14795efdfb2959248af2ff00bc6cafbae9b2002b7eaa50921a72ef928910bc0d2061a414e9c73346848eead108af077c96429870c734495aa
SHA512
817fca3f8e3b127b9b877e0a03d0a94bf0c3ec481d3becf995986ce6ae0532629c5460100eb9f2ef3452ed59a3b9d3ac8362df8f87b387803c36d35ab7af0902
DIST libhugetlbfs-2.21.tar.gz 173052 BLAKE2B
a65fdeee3ed9ad8cb69f772847646befbf5deef0b82d6cb7338e5ff448d5c2461ceb1e381b9515e79f4243482589bb0203874cc52e5c8c6d98667df4eacffa8b
SHA512
87fd95a826bedc2c53b1aa440f5db7ff3ece482d520545b597d4d1231cf84276103c312899b812166872444331bc7b6f1692f0d3b7cbff691efdcf9c2e99b1d0
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-noexec-stack.patch
b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-noexec-stack.patch
deleted file mode 100644
index bf964cda7a6..000
--- a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-noexec-stack.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nuar libhugetlbfs-2.6.orig/sys-elf32ppclinux.S
libhugetlbfs-2.6/sys-elf32ppclinux.S
libhugetlbfs-2.6.orig/sys-elf32ppclinux.S 2009-08-24 12:56:07.0
+
-+++ libhugetlbfs-2.6/sys-elf32ppclinux.S 2009-10-31 06:43:49.040319417
+
-@@ -32,3 +32,7 @@
- mr 8,9
- sc
- blr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -Nuar libhugetlbfs-2.6.orig/sys-elf64ppc.S libhugetlbfs-2.6/sys-elf64ppc.S
libhugetlbfs-2.6.orig/sys-elf64ppc.S 2009-08-24 12:56:07.0
+
-+++ libhugetlbfs-2.6/sys-elf64ppc.S2009-10-31 06:43:54.303652251 +
-@@ -41,3 +41,7 @@
- mr 8,9
- sc
- blr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -Nuar libhugetlbfs-2.6.orig/sys-elf_i386.S libhugetlbfs-2.6/sys-elf_i386.S
libhugetlbfs-2.6.orig/sys-elf_i386.S 2009-08-24 12:56:07.0
+
-+++ libhugetlbfs-2.6/sys-elf_i386.S2009-10-31 06:43:57.536975670 +
-@@ -40,3 +40,7 @@
- pop %edi
- pop %ebp
- ret
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -Nuar libhugetlbfs-2.6.orig/sys-elf_x86_64.S
libhugetlbfs-2.6/sys-elf_x86_64.S
libhugetlbfs-2.6.orig/sys-elf_x86_64.S 2009-08-24 12:56:07.0
+
-+++ libhugetlbfs-2.6/sys-elf_x86_64.S 2009-10-31 06:44:26.943648847 +
-@@ -32,3 +32,7 @@
- mov 0x8(%rsp),%r9
- syscall
- retq
-+
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.18.ebuild
b/sys-libs/libhugetlbfs/libhugetlbfs-2.18.ebuild
deleted file mode 100644
index 3725a9c4975..000
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.18.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="easy hugepage access"
-HOMEPAGE="http://libhugetlbfs.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="static-libs"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.9-build.patch #332517
- epatch "${FILESDIR}"/${PN}-2.6-noexec-stack.patch
-
