* [gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/, sci-physics/fastjet-contrib/files/
@ 2022-08-26 9:50 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2022-08-26 9:50 UTC (permalink / raw
To: gentoo-commits
commit: cb0a7488023274b9a567fbddd5d0198d7b9ec5fe
Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Mon Aug 1 23:06:58 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 09:50:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0a7488
sci-physics/fastjet-contrib: Fix tc ar and ranlib
Closes: https://github.com/gentoo/gentoo/pull/26621
Closes: https://bugs.gentoo.org/860222
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
....049.ebuild => fastjet-contrib-1.049-r1.ebuild} | 6 +-
.../files/fastjet-contrib-1.049-ar.patch | 247 +++++++++++++++++++++
.../files/fastjet-contrib-1.049-soname.patch | 4 +-
3 files changed, 253 insertions(+), 4 deletions(-)
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
similarity index 83%
rename from sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
rename to sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
index cf942ac11e58..5327d49c484d 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
@@ -22,12 +22,14 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-soname.patch
+ "${FILESDIR}"/${P}-ar.patch
)
src_configure() {
- CXX=`tc-getCXX`
- ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
+ 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
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
new file mode 100644
index 000000000000..b7578bd76738
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
@@ -0,0 +1,247 @@
+--- a/Centauro/Makefile
++++ b/Centauro/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ClusteringVetoPlugin/Makefile
++++ b/ClusteringVetoPlugin/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ConstituentSubtractor/Makefile
++++ b/ConstituentSubtractor/Makefile
+@@ -41,8 +41,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/EnergyCorrelator/Makefile
++++ b/EnergyCorrelator/Makefile
+@@ -40,8 +40,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/FlavorCone/Makefile
++++ b/FlavorCone/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/GenericSubtractor/Makefile
++++ b/GenericSubtractor/Makefile
+@@ -38,8 +38,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/JetCleanser/Makefile
++++ b/JetCleanser/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/JetFFMoments/Makefile
++++ b/JetFFMoments/Makefile
+@@ -34,8 +34,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ examples: example
+
+--- a/JetsWithoutJets/Makefile
++++ b/JetsWithoutJets/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/LundPlane/Makefile
++++ b/LundPlane/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/Nsubjettiness/Makefile
++++ b/Nsubjettiness/Makefile
+@@ -40,8 +40,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES) $(EXAMPLES2)
+--- a/QCDAwarePlugin/Makefile
++++ b/QCDAwarePlugin/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/RecursiveTools/Makefile
++++ b/RecursiveTools/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ScJet/Makefile
++++ b/ScJet/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/scripts/internal/Template/Makefile
++++ b/scripts/internal/Template/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/SoftKiller/Makefile
++++ b/SoftKiller/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/SubjetCounting/Makefile
++++ b/SubjetCounting/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ValenciaPlugin/Makefile
++++ b/ValenciaPlugin/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/VariableR/Makefile
++++ b/VariableR/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+
+ lib$(NAME).a: $(OBJS)
+- ar cru lib$(NAME).a $(OBJS)
+- ranlib lib$(NAME).a
++ $(AR) cru lib$(NAME).a $(OBJS)
++ $(RANLIB) lib$(NAME).a
+
+ # building the examples
+ examples: $(EXAMPLES)
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
index 5f69900cdc30..fe3794d5e0f5 100644
--- a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/Makefile.in
++++ b/Makefile.in
@@ -54,7 +54,7 @@
fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/, sci-physics/fastjet-contrib/files/
@ 2025-02-26 13:47 Nowa Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Nowa Ammerlaan @ 2025-02-26 13:47 UTC (permalink / raw
To: gentoo-commits
commit: e2dc7fd1247f2d3dcef0fe03ce7bab11a7bf4657
Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Wed Feb 26 10:46:48 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 13:46:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2dc7fd1
sci-physics/fastjet-contrib: add 1.101
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/40768
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
sci-physics/fastjet-contrib/Manifest | 1 +
...ntrib-9999.ebuild => fastjet-contrib-1.101.ebuild} | 19 ++++++-------------
.../fastjet-contrib/fastjet-contrib-9999.ebuild | 1 +
.../files/fastjet-contrib-1.101-ldflags.patch | 11 +++++++++++
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/sci-physics/fastjet-contrib/Manifest b/sci-physics/fastjet-contrib/Manifest
index 9e51883dec5f..ea35b4a8df6f 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,3 +1,4 @@
DIST fastjet-contrib-1.053.tar.gz 912109 BLAKE2B b195c415163d9ebf8e48d2516ea44014f0f4b112307a86d536e82d62121b0e22d8c862468fddcc8570eea6137c1d757586941af80112459a528e261764a0fb96 SHA512 b8888d30abaead7ec084d551d05dbd53f5a03e226fd58ec1e4c236cb022868c5134a4199dde262f18334628f4b58d532bd0e7955e81d8d964a985646d376878b
DIST fastjet-contrib-1.055.tar.gz 945588 BLAKE2B 5dc40313fa3b1decb1bd6e2ac8ce486b1905e7be3d575e54e43b82982f50202c5eea060390851b92c3f4b08472b8c3f0e304e5bd345e07f4742749ed892d3960 SHA512 2140c4198b704336449bbaed5625428d5e97ae1b744ff83837932189a72f20ba0226843517130cfb0d74fb395abd19c3377f232a86e0e734aded27d52c4ac71d
DIST fastjet-contrib-1.100.tar.gz 1049197 BLAKE2B 3a68754de57f99f23099501fd02c81fbc44fc14f8d114a99c3e3af9653794f5e08e8ca0de4fac22dd95a33355dcede102d59a80088c67c3794fc23f0b186b8ce SHA512 b2903d31f1070ae73dec5f2d2c23f5d60ec2aeda9073978601ad3fbf85adb227ce9e4fb8b6b7e0065e1ea611f002aaf165960733acd2f49c031088912f0a8c95
+DIST fastjet-contrib-1.101.tar.gz 1096239 BLAKE2B 69790facda1e623d1f1ad0f1701f0c0e1aba462c34e83d1164f541c0f5cdbc2577f8d962345ec30f730315f332cc5ab7206f968088153973d2ab05498926b8f6 SHA512 68d2d438a4b4aefd9ea040412bc40b117feac40ed43c3d35f86047bf85f23847a5153da46c6fc3631d46f0c90f5f14a965963f64dd5299e8e0e3a080e714a316
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
similarity index 69%
copy from sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild
copy to sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
index d97361a5c0bc..3d8439f18a9d 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
@@ -1,20 +1,21 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit subversion toolchain-funcs
+inherit toolchain-funcs
MY_PN=fjcontrib
MY_P=${MY_PN}-${PV}
DESCRIPTION="3rd party extensions of FastJet."
HOMEPAGE="https://fastjet.hepforge.org/contrib/"
-ESVN_REPO_URI="https://svn.hepforge.org/fastjetsvn/contrib/trunk"
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
DEPEND=">=sci-physics/fastjet-3.4.1"
RDEPEND="${DEPEND}"
@@ -22,17 +23,9 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-1.049-ar.patch
"${FILESDIR}"/${PN}-1.055-ar-part2.patch # https://github.com/fjcontrib/fjcontrib/issues/3
+ "${FILESDIR}"/${PN}-1.101-ldflags.patch
)
-src_unpack() {
- subversion_src_unpack
- subversion_wc_info || die "subversion_wc_info fails."
- # We need the .svn folder for fetching contributions => copy it
- rsync -rlpgo "${ESVN_WC_PATH}/.svn" "${S}" || die "can't copy .svn."
- cd "${S}" || die "svn should have created ${S}."
- ./scripts/update-contribs.sh || die "can't fetch contributions"
-}
-
src_configure() {
tc-export CXX AR RANLIB
./configure \
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild
index d97361a5c0bc..2d3ba90325ed 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-1.049-ar.patch
"${FILESDIR}"/${PN}-1.055-ar-part2.patch # https://github.com/fjcontrib/fjcontrib/issues/3
+ "${FILESDIR}"/${PN}-1.101-ldflags.patch
)
src_unpack() {
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch
new file mode 100644
index 000000000000..7f8d572ce4ed
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -66,7 +66,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_INCLUDES) $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
++ $(CXX) @DYNLIBOPT@ -fPIC -DPIC $(CXXFLAGS) $(LDFLAGS) `$(FASTJETCONFIG) --cxxflags --libs` $(fragile_SHARED_INCLUDES) $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
+
+ fragile-shared-install: fragile-shared
+ utils/install-sh -c -m 755 libfastjetcontribfragile.@DYNLIBEXT@ $(PREFIX)/lib
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-26 13:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-26 13:47 [gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/, sci-physics/fastjet-contrib/files/ Nowa Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-08-26 9:50 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox