public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ncnn/
Date: Sat, 23 Mar 2024 14:09:37 +0000 (UTC)	[thread overview]
Message-ID: <1711202930.fd3e7f8444703cec62a422c6cc33f26cea4442b7.ionen@gentoo> (raw)

commit:     fd3e7f8444703cec62a422c6cc33f26cea4442b7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 14:03:06 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 14:08:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3e7f84

dev-libs/ncnn: fix openmp automagic

Meant to do this earlier but kind of forgot about it.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../ncnn/{ncnn-20240102.ebuild => ncnn-20240102-r1.ebuild}  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dev-libs/ncnn/ncnn-20240102.ebuild b/dev-libs/ncnn/ncnn-20240102-r1.ebuild
similarity index 82%
rename from dev-libs/ncnn/ncnn-20240102.ebuild
rename to dev-libs/ncnn/ncnn-20240102-r1.ebuild
index d2e68b1ee053..0a726c51cc3e 100644
--- a/dev-libs/ncnn/ncnn-20240102.ebuild
+++ b/dev-libs/ncnn/ncnn-20240102-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="High-performance neural network inference framework"
 HOMEPAGE="https://github.com/Tencent/ncnn/"
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD ZLIB"
 SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
 KEYWORDS="amd64 ~x86"
-IUSE="tools +vulkan"
+IUSE="openmp tools +vulkan"
 
 # Need the static library to run tests + skip vulkan / GPU:
 # -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF
@@ -38,11 +38,20 @@ DEPEND="
 
 DOCS=( README.md docs/. )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
 		-DNCNN_BUILD_EXAMPLES=no
 		-DNCNN_BUILD_TOOLS=$(usex tools)
+		-DNCNN_OPENMP=$(usex openmp)
 		-DNCNN_PYTHON=no # todo if something needs it
 		-DNCNN_SHARED_LIB=yes
 		-DNCNN_SIMPLEVK=no


             reply	other threads:[~2024-03-23 14:09 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-23 14:09 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-05  5:33 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ncnn/ Ionen Wolkens
2025-05-25 16:34 Sam James
2025-05-04 10:20 Ionen Wolkens
2025-05-04 10:20 Ionen Wolkens
2025-04-28 12:58 Ionen Wolkens
2025-04-27  9:49 Ionen Wolkens
2025-04-27  9:49 Ionen Wolkens
2025-03-13  8:59 Sam James
2025-02-22  3:07 Ionen Wolkens
2025-01-10 21:04 Ionen Wolkens
2024-11-04 16:15 Ionen Wolkens
2024-09-09 13:46 Sam James
2024-08-20 15:50 Ionen Wolkens
2024-05-12 20:25 Ionen Wolkens
2024-04-27 21:46 Sam James
2024-04-12 19:36 Ionen Wolkens
2024-04-10 19:07 Ionen Wolkens
2024-02-22  6:16 Ionen Wolkens
2024-01-24 20:34 Arthur Zamarin
2024-01-02  4:55 Ionen Wolkens
2023-11-30 19:42 Ionen Wolkens
2023-11-16 17:17 Arthur Zamarin
2023-10-27 10:33 Ionen Wolkens
2023-10-10 20:20 Ionen Wolkens
2023-09-12 16:15 Ionen Wolkens
2023-08-16 12:53 Ionen Wolkens
2023-08-09 18:14 Piotr Karbowski
2023-06-02  6:54 Ionen Wolkens
2023-05-23  2:52 Sam James
2023-05-17  9:12 Ionen Wolkens
2023-02-23  9:22 Ionen Wolkens
2022-12-19  7:23 Ionen Wolkens
2022-11-28  5:58 Ionen Wolkens
2022-11-28  4:12 Ionen Wolkens
2022-11-08 23:57 Nick Sarnie
2022-08-07 13:59 Ionen Wolkens
2022-07-29  5:21 Ionen Wolkens
2022-07-21  5:38 Ionen Wolkens
2022-07-02  2:27 Ionen Wolkens
2022-05-13 14:51 Ionen Wolkens
2022-04-20  3:33 Ionen Wolkens
2022-04-20  2:40 Ionen Wolkens
2022-04-20  2:40 Ionen Wolkens
2021-06-08  7:10 Ionen Wolkens
2021-05-31 19:30 Piotr Karbowski
2021-05-31 19:30 Piotr Karbowski
2020-08-30 18:27 Piotr Karbowski
2020-04-26 20:09 Piotr Karbowski
2020-03-31 20:50 Piotr Karbowski
2020-03-29 22:08 Piotr Karbowski
2020-03-29 21:09 Piotr Karbowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1711202930.fd3e7f8444703cec62a422c6cc33f26cea4442b7.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox