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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B91F6158042 for ; Fri, 15 Nov 2024 09:27:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11B42E09ED; Fri, 15 Nov 2024 09:27:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA655E09ED for ; Fri, 15 Nov 2024 09:27:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08A3F33BF29 for ; Fri, 15 Nov 2024 09:27:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A56C18C4 for ; Fri, 15 Nov 2024 09:26:59 +0000 (UTC) From: "Alexander Puck Neuwirth" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Puck Neuwirth" Message-ID: <1731662790.17e968522e147ebcd5b813034d8cffe1a5d4acb1.alexander@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/qcdloop/, sci-physics/qcdloop/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/qcdloop/files/qcdloop-2.0.11-quadmathpath.patch sci-physics/qcdloop/qcdloop-2.0.11.ebuild sci-physics/qcdloop/qcdloop-2.0.5.ebuild X-VCS-Directories: sci-physics/qcdloop/files/ sci-physics/qcdloop/ X-VCS-Committer: alexander X-VCS-Committer-Name: Alexander Puck Neuwirth X-VCS-Revision: 17e968522e147ebcd5b813034d8cffe1a5d4acb1 X-VCS-Branch: master Date: Fri, 15 Nov 2024 09:26:59 +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: 106f8607-5801-4260-8436-b1aabaef3288 X-Archives-Hash: 1fa8e5f00cf32678d55af51683a0a793 commit: 17e968522e147ebcd5b813034d8cffe1a5d4acb1 Author: Alexander Puck Neuwirth neuwirth-informatik de> AuthorDate: Fri Nov 15 09:11:49 2024 +0000 Commit: Alexander Puck Neuwirth neuwirth-informatik de> CommitDate: Fri Nov 15 09:26:30 2024 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=17e96852 sci-physics/qcdloop: add 2.0.11, drop 2.0.5 Signed-off-by: Alexander Puck Neuwirth neuwirth-informatik.de> .../qcdloop/files/qcdloop-2.0.11-quadmathpath.patch | 21 +++++++++++++++++++++ .../{qcdloop-2.0.5.ebuild => qcdloop-2.0.11.ebuild} | 21 +++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/sci-physics/qcdloop/files/qcdloop-2.0.11-quadmathpath.patch b/sci-physics/qcdloop/files/qcdloop-2.0.11-quadmathpath.patch new file mode 100644 index 000000000..86275d338 --- /dev/null +++ b/sci-physics/qcdloop/files/qcdloop-2.0.11-quadmathpath.patch @@ -0,0 +1,21 @@ +From 2c316f000e83e56419709fe64b7627d4541ef5aa Mon Sep 17 00:00:00 2001 +From: Alexander Puck Neuwirth +Date: Fri, 15 Nov 2024 10:19:40 +0100 +Subject: [PATCH] Add one more QUADMATH lookup path + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8820da..64bd4c3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,6 +75,7 @@ find_library(QUADMATH_LIBRARY + /usr/local/lib /usr/x86_64-linux-gnu/* + /usr/lib/gcc/x86_64-linux-gnu/* + /usr/lib/gcc/x86_64-redhat-linux/* ++ /usr/lib/gcc/x86_64-pc-linux-gnu/* + "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" + ) + diff --git a/sci-physics/qcdloop/qcdloop-2.0.5.ebuild b/sci-physics/qcdloop/qcdloop-2.0.11.ebuild similarity index 52% rename from sci-physics/qcdloop/qcdloop-2.0.5.ebuild rename to sci-physics/qcdloop/qcdloop-2.0.11.ebuild index 672957c56..f30ea4e12 100644 --- a/sci-physics/qcdloop/qcdloop-2.0.5.ebuild +++ b/sci-physics/qcdloop/qcdloop-2.0.11.ebuild @@ -16,12 +16,29 @@ SLOT="0" KEYWORDS="~amd64" PATCHES=( - "${FILESDIR}"/${P}-cxx.patch + "${FILESDIR}"/${P}-quadmathpath.patch # https://github.com/scarrazza/qcdloop/pull/31 ) +src_prepare() { + cmake_src_prepare + + # gentoo libdir love + sed -i \ + -e '/DESTINATION/s/lib/lib${LIB_SUFFIX}/g' \ + CMakeLists.txt || die + sed -i \ + -e '/libdir.*/s/lib/lib${LIB_SUFFIX}/g' \ + CMakeLists.txt || die + + #sed -i \ + # -e '/qcdloop/s/SHARED/STATIC/g' \ + # CMakeLists.txt || die +} + src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${ESYSROOT}/usr/$(get_libdir)" + -DCMAKE_INSTALL_PREFIX="${ESYSROOT}"/usr + -DENABLE_FORTRAN_WRAPPER=ON ) cmake_src_configure }