public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-process/numactl/, sys-process/numactl/files/
@ 2019-09-05  9:23 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2019-09-05  9:23 UTC (permalink / raw
  To: gentoo-commits

commit:     70f1db8ce052fb213d978f3b903c701cf659fb36
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 09:23:32 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 09:23:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f1db8c

sys-process/numactl: Removed old

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-process/numactl/Manifest                       |  1 -
 .../numactl/files/numactl-2.0.11-sysmacros.patch   | 41 ----------------
 .../numactl/files/numactl-2.0.8-cpuid-pic.patch    | 17 -------
 sys-process/numactl/numactl-2.0.11.ebuild          | 54 ----------------------
 4 files changed, 113 deletions(-)

diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 879976de1f4..318046859f0 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,3 +1,2 @@
-DIST numactl-2.0.11.tar.gz 408175 BLAKE2B 0767d555d5254e780ef50bd66215e84208e88fb37422fd86443e53ee52faef4242ff21e6028bdb92c4e1fa7815cdb23e87cd084763539dc1d560097f43bd563f SHA512 1969d7ee0ff3de0d6f1fa42ec089a17cdb3f92cb35d453b8f8b2eec49724c43787ecbd213357013a8f2500a260b0df9844d515815ca3a0376314a0eed050a0d4
 DIST numactl-2.0.12.tar.gz 423020 BLAKE2B 39d33612591df805715c51280bf34b8328ba6fc49bdaf9dd3bd67e076f9d319c9622ef72766c12e319f4be27ee9ec7f5ecb054a6e8c7c3cf568a69aea624d511 SHA512 316b10f50e6eee4cee9cf191f19381ec4a61980354eec3f9fe43fef21465bee28a82adeb9c235d4877e82950ccd14c9473b79fd1e2f5a7f598ec2fac230780ff
 DIST numactl-2.0.13.tar.gz 438096 BLAKE2B f615fafdb366930c6cdee1e4ef3d1e1d5e21f8f1c09aa904c0ebfa56972a99144991c6907127ef35794ca19d711e41b54488c5bfaeca8a0149ab9697d8c1ef75 SHA512 f7b747eb8f3ded9f3661cb0fc7b65b5ed490677f881f8fe6a000baf714747515853b4e5c8781b014241180bf16e9f0bfdf2c6f758725e34b4938696ba496b72a

diff --git a/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch b/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch
deleted file mode 100644
index 3f953675739..00000000000
--- a/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/580098
-
-From c1644f92e340d797e490c41a9ef9961125d202b9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Apr 2016 18:49:51 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor
-
-These functions are not part of any official spec, and glibc has always
-kept them in sys/sysmacros.h.  As glibc moves to conform to POSIX, and
-more alternative C libraries come up, we need to include this header
-explicitly to get the prototypes.  Otherwise we fail to build like:
-
-affinity.c: In function 'affinity_file':
-affinity.c:177:7: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
-   if (major(d) != maj || minor(d) != min)
-       ^
-affinity.c:177:26: warning: implicit declaration of function 'minor' [-Wimplicit-function-declaration]
-   if (major(d) != maj || minor(d) != min)
-                          ^
-./.libs/libnuma.so: undefined reference to 'minor'
-./.libs/libnuma.so: undefined reference to 'major'
-collect2: error: ld returned 1 exit status
----
- affinity.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/affinity.c b/affinity.c
-index 9fbd6af..984291c 100644
---- a/affinity.c
-+++ b/affinity.c
-@@ -40,6 +40,7 @@
- #include <linux/rtnetlink.h>
- #include <linux/netlink.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <ctype.h>
- #include <assert.h>
- #include <regex.h>
--- 
-2.7.4
-

diff --git a/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch b/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch
deleted file mode 100644
index 02e84b72577..00000000000
--- a/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-make the code work on x86/PIC.  this code is only used in the demo,
-and the overhead of always running this is system noise, so don't
-bother bracketing with __i386__/__PIC__ defines.
-
-http://bugs.gentoo.org/456238
-
---- a/clearcache.c
-+++ b/clearcache.c
-@@ -57,7 +57,7 @@ void clearcache(unsigned char *mem, unsigned size)
- #if defined(__i386__) || defined(__x86_64__)
- 	unsigned i, cl, eax, feat;
- 	/* get clflush unit and feature */
--	asm("cpuid" : "=a" (eax), "=b" (cl), "=d" (feat) : "0" (1) : "cx");
-+	asm("xchg %%ebx, %%esi; cpuid; xchg %%esi, %%ebx;" : "=a" (eax), "=S" (cl), "=d" (feat) : "0" (1) : "cx");
- 	if (!(feat & (1 << 19)))
- 		fallback_clearcache();
- 	cl = ((cl >> 8) & 0xff) * 8;

diff --git a/sys-process/numactl/numactl-2.0.11.ebuild b/sys-process/numactl/numactl-2.0.11.ebuild
deleted file mode 100644
index 513866b7c61..00000000000
--- a/sys-process/numactl/numactl-2.0.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs multilib-minimal
-
-DESCRIPTION="Utilities and libraries for NUMA systems"
-HOMEPAGE="http://oss.sgi.com/projects/libnuma/"
-SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ARM lacks the __NR_migrate_pages syscall.
-KEYWORDS="amd64 -arm ia64 ~mips ppc ppc64 x86 ~amd64-linux"
-IUSE=""
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
-	epatch "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
-	epatch "${FILESDIR}"/${PN}-2.0.11-sysmacros.patch #580098
-	eautoreconf
-	# We need to copy the sources or else tests will fail
-	multilib_copy_sources
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		if [ -d /sys/devices/system/node ]; then
-			einfo "The only generically safe test is regress2."
-			einfo "The other test cases require 2 NUMA nodes."
-			emake regress2
-		else
-			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-		fi
-	fi
-}
-
-multilib_src_compile() {
-	multilib_is_native_abi && default || emake libnuma.la
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
-}
-
-multilib_src_install_all() {
-	DOCS=( README TODO CHANGES DESIGN )
-	einstalldocs
-	# delete man pages provided by the man-pages package #238805
-	rm -r "${ED}"/usr/share/man/man[25] || die
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/numactl/, sys-process/numactl/files/
@ 2020-09-19 14:09 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2020-09-19 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     13b97babb3499c19efd58677c32e631344e2b6b0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 13:43:31 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 14:09:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b97bab

sys-process/numactl: Bump to version 2.0.14

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-process/numactl/Manifest                       |  1 +
 .../files/numactl-2.0.14-numademo-cflags.patch     | 15 +++++
 sys-process/numactl/numactl-2.0.14.ebuild          | 70 ++++++++++++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 318046859f0..fdd5d49a0d1 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,2 +1,3 @@
 DIST numactl-2.0.12.tar.gz 423020 BLAKE2B 39d33612591df805715c51280bf34b8328ba6fc49bdaf9dd3bd67e076f9d319c9622ef72766c12e319f4be27ee9ec7f5ecb054a6e8c7c3cf568a69aea624d511 SHA512 316b10f50e6eee4cee9cf191f19381ec4a61980354eec3f9fe43fef21465bee28a82adeb9c235d4877e82950ccd14c9473b79fd1e2f5a7f598ec2fac230780ff
 DIST numactl-2.0.13.tar.gz 438096 BLAKE2B f615fafdb366930c6cdee1e4ef3d1e1d5e21f8f1c09aa904c0ebfa56972a99144991c6907127ef35794ca19d711e41b54488c5bfaeca8a0149ab9697d8c1ef75 SHA512 f7b747eb8f3ded9f3661cb0fc7b65b5ed490677f881f8fe6a000baf714747515853b4e5c8781b014241180bf16e9f0bfdf2c6f758725e34b4938696ba496b72a
+DIST numactl-2.0.14.tar.gz 439000 BLAKE2B 5f2abe25061ac29ecad8a6b24fe800d72c3538d9a155358f4b329ed1140053c7dbd93f01891904f76db94ed01113a34b4ebcbbf40e4060caf747958785ac9590 SHA512 28b95985d6b2f26c5f6f15fe235224c998c86f534adf5fdaa355a292cf2fd65515c91ba2a76c899d552d439b18ea1209a1712bd6755f8ee3a442f3935993b2e6

diff --git a/sys-process/numactl/files/numactl-2.0.14-numademo-cflags.patch b/sys-process/numactl/files/numactl-2.0.14-numademo-cflags.patch
new file mode 100644
index 00000000000..de7ad2894dd
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.14-numademo-cflags.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/540856
+
+respect user CFLAGS
+
+--- numactl-2.0.14/Makefile.am
++++ numactl-2.0.14/Makefile.am
+@@ -24,7 +24,7 @@
+ 
+ numademo_SOURCES = numademo.c stream_lib.c stream_lib.h mt.c mt.h clearcache.c clearcache.h
+ numademo_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_STREAM_LIB -DHAVE_MT -DHAVE_CLEAR_CACHE
+-numademo_CFLAGS = $(AM_CFLAGS) -O3 -ffast-math -funroll-loops
++numademo_CFLAGS = $(AM_CFLAGS) -ffast-math -funroll-loops
+ if HAVE_TREE_VECTORIZE
+ numademo_CFLAGS += -ftree-vectorize
+ endif

diff --git a/sys-process/numactl/numactl-2.0.14.ebuild b/sys-process/numactl/numactl-2.0.14.ebuild
new file mode 100644
index 00000000000..10a7d7f0796
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.14.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="https://github.com/numactl/numactl"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
+else
+	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
+	# ARM lacks the __NR_migrate_pages syscall.
+	KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.14-numademo-cflags.patch #540856
+)
+
+src_prepare() {
+	default
+
+	# lto not supported yet
+	# gcc-9 with -flto leads to link failures: #692254
+	filter-flags -flto*
+
+	eautoreconf
+	# We need to copy the sources or else tests will fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		if [[ -d /sys/devices/system/node ]] ; then
+			einfo "The only generically safe test is regress2."
+			einfo "The other test cases require 2 NUMA nodes."
+			emake regress2
+		else
+			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+	find "${ED}"/usr/ -type f -name libnuma.la -delete || die
+}
+
+multilib_src_install_all() {
+	local DOCS=( README.md )
+	einstalldocs
+	# delete man pages provided by the man-pages package #238805
+	rm -r "${ED}"/usr/share/man/man[25] || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/numactl/, sys-process/numactl/files/
@ 2021-07-05 16:53 Marek Szuba
  0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-07-05 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c5d15ae7a8562758324929aec51ee08c6c8b8ac5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 16:43:37 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 16:53:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d15ae7

sys-process/numactl: keyword 2.0.14 for ~riscv

Needed a backported upstream patch to link against libatomic
but with that in place, builds and installs just fine.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../numactl/files/numactl-2.0.14-latomic.patch     | 50 ++++++++++++++++++++++
 sys-process/numactl/numactl-2.0.14.ebuild          |  3 +-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/sys-process/numactl/files/numactl-2.0.14-latomic.patch b/sys-process/numactl/files/numactl-2.0.14-latomic.patch
new file mode 100644
index 00000000000..61655f40996
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.14-latomic.patch
@@ -0,0 +1,50 @@
+From e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 6 May 2021 23:08:36 +0200
+Subject: [PATCH] link with -latomic if needed
+
+numactl unconditionally uses __atomic_fetch_and but some architectures
+(e.g. sparc) needs to link with -latomic to be able to use it. So check
+if -latomic is needed and update numa.pc accordingly
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ Makefile.am  | 1 +
+ configure.ac | 2 ++
+ numa.pc.in   | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 44d0d76..34f6815 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -151,6 +151,7 @@ SED_PROCESS = \
+         -e 's,@exec_prefix\@,$(exec_prefix),g' \
+         -e 's,@libdir\@,$(libdir),g' \
+         -e 's,@includedir\@,$(includedir),g' \
++        -e 's,@LIBS\@,$(LIBS),g' \
+         < $< > $@ || rm $@
+ 
+ %.pc: %.pc.in Makefile
+diff --git a/configure.ac b/configure.ac
+index 659a765..e3b0eb3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,8 @@ AM_CONDITIONAL([HAVE_TREE_VECTORIZE], [test x"${tree_vectorize}" = x"true"])
+ 
+ AC_CONFIG_FILES([Makefile])
+ 
++AC_SEARCH_LIBS([__atomic_fetch_and_1], [atomic])
++
+ # GCC tries to be "helpful" and only issue a warning for unrecognized
+ # attributes.  So we compile the test with Werror, so that if the
+ # attribute is not recognized the compilation fails
+diff --git a/numa.pc.in b/numa.pc.in
+index 8a0f202..cc04d50 100644
+--- a/numa.pc.in
++++ b/numa.pc.in
+@@ -8,3 +8,4 @@ Description: NUMA policy library
+ Version: @VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lnuma
++Libs.Private: @LIBS@

diff --git a/sys-process/numactl/numactl-2.0.14.ebuild b/sys-process/numactl/numactl-2.0.14.ebuild
index 05dee9031d2..e6f89bb776d 100644
--- a/sys-process/numactl/numactl-2.0.14.ebuild
+++ b/sys-process/numactl/numactl-2.0.14.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
 	# ARM lacks the __NR_migrate_pages syscall.
-	KEYWORDS="~alpha amd64 -arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 -arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2"
@@ -21,6 +21,7 @@ SLOT="0"
 IUSE="static-libs"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.14-latomic.patch
 	"${FILESDIR}"/${PN}-2.0.14-numademo-cflags.patch #540856
 )
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/numactl/, sys-process/numactl/files/
@ 2023-07-23  1:52 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-07-23  1:52 UTC (permalink / raw
  To: gentoo-commits

commit:     bd9ea44dff37434afdb34f44096edcdc875bb3f8
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jun 26 06:17:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 01:42:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9ea44d

sys-process/numactl: Fix build with clang-16 and musl

These are some of the patches from upstream that fixes build with
clang-16 and musl, hence the backporting them till a new release.

Clsoses: https://bugs.gentoo.org/906539
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31610
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ....16-configure-check-for-largefile-support.patch | 27 +++++++++
 ...0.16-replace-stat64-with-normal-functions.patch | 65 ++++++++++++++++++++
 sys-process/numactl/numactl-2.0.16-r1.ebuild       | 69 ++++++++++++++++++++++
 3 files changed, 161 insertions(+)

diff --git a/sys-process/numactl/files/numactl-2.0.16-configure-check-for-largefile-support.patch b/sys-process/numactl/files/numactl-2.0.16-configure-check-for-largefile-support.patch
new file mode 100644
index 000000000000..f22ba23999c1
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.16-configure-check-for-largefile-support.patch
@@ -0,0 +1,27 @@
+https://github.com/numactl/numactl/commit/246b0e695644ad614f6c324505d7cfa6e74f1fc1.patch
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 15 Dec 2022 12:10:37 -0800
+Subject: [PATCH] configure: Check for largefile support
+
+This helps in using 64bit versions of off_t related functions
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ebf9917..6139132 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,6 +14,9 @@ LT_INIT
+ 
+ AC_PROG_CC
+ 
++# Check for enabling LFS support
++AC_SYS_LARGEFILE
++
+ # Override CFLAGS so that we can specify custom CFLAGS for numademo.
+ AX_AM_OVERRIDE_VAR([CFLAGS])
+ 
+

diff --git a/sys-process/numactl/files/numactl-2.0.16-replace-stat64-with-normal-functions.patch b/sys-process/numactl/files/numactl-2.0.16-replace-stat64-with-normal-functions.patch
new file mode 100644
index 000000000000..9b08a55c2e77
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.16-replace-stat64-with-normal-functions.patch
@@ -0,0 +1,65 @@
+https://github.com/numactl/numactl/commit/851bbd5b963a7a5d95b8fe3102cf05972dc72655.patch
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 15 Dec 2022 12:11:13 -0800
+Subject: [PATCH] shm.c: Replace stat64/fstat64/ftruncate64mmap64 with normal
+ functions
+
+These functions were needed when _FILE_OFFSET_BITS was not 64, using
+AC_SYS_LARGEFILE will detect it correctly and make the normal variants
+of these functions behave same as their *64 counterparts.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ shm.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/shm.c b/shm.c
+index 20537d9..5d0d1ab 100644
+--- a/shm.c
++++ b/shm.c
+@@ -24,8 +24,8 @@
+ #include <sys/mman.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+-#include <sys/fcntl.h>
+ #include <sys/stat.h>
++#include <fcntl.h>
+ #include <stdarg.h>
+ #include <errno.h>
+ #include <unistd.h>
+@@ -135,7 +135,7 @@ void attach_sysvshm(char *name, char *opt)
+ /* Attach a shared memory file. */
+ void attach_shared(char *name, char *opt)
+ {
+-	struct stat64 st;
++	struct stat st;
+ 
+ 	shmfd = open(name, O_RDWR);
+ 	if (shmfd < 0) {
+@@ -146,14 +146,14 @@ void attach_shared(char *name, char *opt)
+ 		if (shmfd < 0)
+ 			nerror("cannot create file %s", name);
+ 	}
+-	if (fstat64(shmfd, &st) < 0)
++	if (fstat(shmfd, &st) < 0)
+ 		err("shm stat");
+ 	/* the file size must be larger than mmap shmlen + shmoffset, otherwise SIGBUS
+ 	 * will be caused when we access memory, because mmaped memory is no longer in
+ 	 * the range of the file laster.
+ 	 */
+ 	if ((shmlen + shmoffset) > st.st_size) {
+-		if (ftruncate64(shmfd, shmlen + shmoffset) < 0) {
++		if (ftruncate(shmfd, shmlen + shmoffset) < 0) {
+ 			/* XXX: we could do it by hand, but it would it
+ 			   would be impossible to apply policy then.
+ 			   need to fix that in the kernel. */
+@@ -168,7 +168,7 @@ void attach_shared(char *name, char *opt)
+ 
+ 	/* RED-PEN For shmlen > address space may need to map in pieces.
+ 	   Left for some poor 32bit soul. */
+-	shmptr = mmap64(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset);
++	shmptr = mmap(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset);
+ 	if (shmptr == (char*)-1)
+ 		err("shm mmap");
+ }
+

diff --git a/sys-process/numactl/numactl-2.0.16-r1.ebuild b/sys-process/numactl/numactl-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..dca719d54ef6
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.16-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="https://github.com/numactl/numactl"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
+else
+	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.14-numademo-cflags.patch # bug #540856
+	"${FILESDIR}"/${PN}-2.0.16-replace-stat64-with-normal-functions.patch # bug #540856
+	"${FILESDIR}"/${PN}-2.0.16-configure-check-for-largefile-support.patch # bug #540856
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# We need to copy the sources or else tests will fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		if [[ -d /sys/devices/system/node ]] ; then
+			einfo "The only generically safe test is regress2."
+			einfo "The other test cases require 2 NUMA nodes."
+			emake regress2
+		else
+			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+	find "${ED}"/usr/ -type f -name libnuma.la -delete || die
+}
+
+multilib_src_install_all() {
+	local DOCS=( README.md )
+	einstalldocs
+
+	# Delete man pages provided by the man-pages package, bug #238805
+	rm -r "${ED}"/usr/share/man/man[25] || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-07-23  1:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-05 16:53 [gentoo-commits] repo/gentoo:master commit in: sys-process/numactl/, sys-process/numactl/files/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2023-07-23  1:52 Sam James
2020-09-19 14:09 Lars Wendler
2019-09-05  9:23 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox