* [gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/files/, sci-physics/fastjet-contrib/
@ 2022-07-22 9:42 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2022-07-22 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 806ecc0d4efdc7a87df9798508ad27eb49dcc6d6
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 09:39:50 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 09:42:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=806ecc0d
sci-physics/fastjet-contrib: new package, add 1.049
Closes: https://github.com/gentoo/sci/pull/1158
Co-authored-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-physics/fastjet-contrib/Manifest | 1 +
.../fastjet-contrib/fastjet-contrib-1.049.ebuild | 39 ++++++++++++++++++++++
.../files/fastjet-contrib-1.049-soname.patch | 11 ++++++
sci-physics/fastjet-contrib/metadata.xml | 15 +++++++++
4 files changed, 66 insertions(+)
diff --git a/sci-physics/fastjet-contrib/Manifest b/sci-physics/fastjet-contrib/Manifest
new file mode 100644
index 000000000000..286bd2321c57
--- /dev/null
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -0,0 +1 @@
+DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f SHA512 21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
new file mode 100644
index 000000000000..c5de8596605c
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/"
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-soname.patch
+)
+
+src_configure() {
+ ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+src_compile() {
+ emake
+ emake fragile-shared
+}
+
+src_install() {
+ emake install PREFIX="${ED}/usr"
+ dolib.so libfastjetcontribfragile.so
+ # The name used for requesting this library varies
+ dosym libfastjetcontribfragile.so /usr/$(get_libdir)/libfastjetcontribfragile.so.0
+ dosym libfastjetcontribfragile.so /usr/$(get_libdir)/fastjetcontribfragile.so.0
+}
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
new file mode 100644
index 000000000000..5f69900cdc30
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
@@ -0,0 +1,11 @@
+--- fjcontrib-1.046.orig/Makefile.in 2022-03-10 13:44:33.963887464 +0100
++++ fjcontrib-1.046/Makefile.in 2022-03-10 13:45:02.573890763 +0100
+@@ -54,7 +54,7 @@
+
+ fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@
+ libfastjetcontribfragile.@DYNLIBEXT@: $(fragile_SHARED_SRC_LIST)
+- $(CXX) @DYNLIBOPT@ -fPIC -DPIC $(CXXFLAGS) `$(FASTJETCONFIG) --cxxflags --libs` $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
++ $(CXX) @DYNLIBOPT@ -fPIC -DPIC -Wl,-Ol -Wl,--as-needed -Wl,-soname,fastjetcontribfragile.so.0 $(LDFLAGS) $(CXXFLAGS) `$(FASTJETCONFIG) --cxxflags --libs` $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
+
+ fragile-shared-install: fragile-shared
+ utils/install-sh -c -m 755 libfastjetcontribfragile.@DYNLIBEXT@ $(PREFIX)/lib
diff --git a/sci-physics/fastjet-contrib/metadata.xml b/sci-physics/fastjet-contrib/metadata.xml
new file mode 100644
index 000000000000..2ba65cdb8045
--- /dev/null
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci-physics@gentoo.org</email>
+ <name>Gentoo Physics Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ The fastjet-contrib space is intended to provide a common location for access to 3rd party extensions of FastJet.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/files/, sci-physics/fastjet-contrib/
@ 2023-02-19 19:56 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-02-19 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 34c58f997155323ca47d73f6d58213fa09a08b88
Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Fri Feb 17 13:38:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 19:55:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c58f99
sci-physics/fastjet-contrib: uint -> unsigned int
Closes: https://bugs.gentoo.org/873646
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/29633
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../fastjet-contrib-1.049-r2.ebuild | 45 ++++++++++++++++++++++
.../files/fastjet-contrib-1.049-musl.patch | 11 ++++++
2 files changed, 56 insertions(+)
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
new file mode 100644
index 000000000000..e21a08bc6b6b
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/"
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-soname.patch
+ "${FILESDIR}"/${P}-ar.patch
+ "${FILESDIR}"/${P}-musl.patch
+)
+
+src_configure() {
+ tc-export CXX AR RANLIB
+ ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config RANLIB="${RANLIB}" AR="${AR}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+ emake
+ emake fragile-shared
+}
+
+src_install() {
+ emake install PREFIX="${ED}/usr"
+ dolib.so libfastjetcontribfragile.so
+ # The name used for requesting this library varies
+ dosym libfastjetcontribfragile.so /usr/$(get_libdir)/libfastjetcontribfragile.so.0
+ dosym libfastjetcontribfragile.so /usr/$(get_libdir)/fastjetcontribfragile.so.0
+}
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch
new file mode 100644
index 000000000000..880e145ba060
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch
@@ -0,0 +1,11 @@
+--- a/LundPlane/example_dpsi_slice.cc
++++ b/LundPlane/example_dpsi_slice.cc
+@@ -124,7 +124,7 @@
+
+ int index_of_max_kt_secondary = -1;
+ double dpsi;
+- for (uint i_secondary=0; i_secondary<secondaries.size(); i_secondary++) {
++ for (unsigned int i_secondary=0; i_secondary<secondaries.size(); i_secondary++) {
+ if (secondaries[i_secondary]->z() > z2_cut) {
+
+ index_of_max_kt_secondary = i_secondary;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-19 19:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-19 19:56 [gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/files/, sci-physics/fastjet-contrib/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-07-22 9:42 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox