public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/netgen/files/, media-gfx/netgen/
Date: Mon, 06 Jan 2025 01:00:06 +0000 (UTC)	[thread overview]
Message-ID: <1736125141.47564dfaf7761b2344096c0201ff33cbb7b2b078.sam@gentoo> (raw)

commit:     47564dfaf7761b2344096c0201ff33cbb7b2b078
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Jan  6 00:52:19 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 00:59:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47564dfa

media-gfx/netgen: #947567

Closes: https://bugs.gentoo.org/947567
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch | 6 +++---
 media-gfx/netgen/netgen-6.2.2406.ebuild                           | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch b/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch
index ef58deb5261c..17bf2ad95f61 100644
--- a/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch
+++ b/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch
@@ -12,8 +12,8 @@ diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt
 index b1036ea..78340b6 100644
 --- a/nglib/CMakeLists.txt
 +++ b/nglib/CMakeLists.txt
-@@ -11,6 +11,11 @@ if(EMSCRIPTEN)
-   target_include_directories(nglib PUBLIC $<TARGET_PROPERTY:ngcore,INTERFACE_INCLUDE_DIRECTORIES>)
+@@ -13,6 +13,11 @@ if(EMSCRIPTEN)
+   target_link_libraries(nglib PRIVATE ${ZLIB_LIBRARIES} $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>)
  else(EMSCRIPTEN)
    target_link_libraries(nglib PUBLIC ngcore)
 +  if(TARGET JPEG::JPEG)
@@ -21,7 +21,7 @@ index b1036ea..78340b6 100644
 +  else()
 +    set(JPEG_LIBRARIES ${JPEG_LIBRARY_RELEASE})
 +  endif()
-   target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )
+   target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )
  endif(EMSCRIPTEN)
  
 -- 

diff --git a/media-gfx/netgen/netgen-6.2.2406.ebuild b/media-gfx/netgen/netgen-6.2.2406.ebuild
index b12748d38fb9..35c30b24ff1d 100644
--- a/media-gfx/netgen/netgen-6.2.2406.ebuild
+++ b/media-gfx/netgen/netgen-6.2.2406.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake desktop python-single-r1 xdg
+inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Automatic 3d tetrahedral mesh generator"
 HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen"
@@ -101,6 +101,8 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto
+
 	local mycmakeargs=(
 		# currently not working in a sandbox, expects netgen to be installed
 		# see https://github.com/NGSolve/netgen/issues/132
@@ -147,7 +149,9 @@ src_configure() {
 src_test() {
 	DESTDIR="${T}" cmake_build install
 
-	export PYTHONPATH="${T}/$(python_get_sitedir):${T}/usr/$(get_libdir):${BUILD_DIR}/libsrc/core"
+	if use python; then
+		export PYTHONPATH="${T}/$(python_get_sitedir):${T}/usr/$(get_libdir):${BUILD_DIR}/libsrc/core"
+	fi
 
 	CMAKE_SKIP_TESTS=(
 		'^unit_symboltable$'


             reply	other threads:[~2025-01-06  1:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-06  1:00 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-09 21:08 [gentoo-commits] repo/gentoo:master commit in: media-gfx/netgen/files/, media-gfx/netgen/ Alexey Shvetsov
2025-01-05 20:35 Sam James
2024-11-25  2:40 Sam James

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=1736125141.47564dfaf7761b2344096c0201ff33cbb7b2b078.sam@gentoo \
    --to=sam@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