From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8209D13933E for ; Mon, 5 Jul 2021 16:53:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA0D3E0A64; Mon, 5 Jul 2021 16:53:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A335E0A64 for ; Mon, 5 Jul 2021 16:53:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3602D342B1C for ; Mon, 5 Jul 2021 16:53:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 982777C5 for ; Mon, 5 Jul 2021 16:53:29 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1625504002.c5d15ae7a8562758324929aec51ee08c6c8b8ac5.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/numactl/, sys-process/numactl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/numactl/files/numactl-2.0.14-latomic.patch sys-process/numactl/numactl-2.0.14.ebuild X-VCS-Directories: sys-process/numactl/ sys-process/numactl/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c5d15ae7a8562758324929aec51ee08c6c8b8ac5 X-VCS-Branch: master Date: Mon, 5 Jul 2021 16:53:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 205bdf3b-b756-4459-b4a8-ba19078f91c8 X-Archives-Hash: 3419a73356387f3d8220d93b75668cc3 commit: c5d15ae7a8562758324929aec51ee08c6c8b8ac5 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 5 16:43:37 2021 +0000 Commit: Marek Szuba gentoo 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 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 +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 +--- + 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 )