| 1 |
commit: cb0a7488023274b9a567fbddd5d0198d7b9ec5fe |
| 2 |
Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de> |
| 3 |
AuthorDate: Mon Aug 1 23:06:58 2022 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 26 09:50:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0a7488 |
| 7 |
|
| 8 |
sci-physics/fastjet-contrib: Fix tc ar and ranlib |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/26621 |
| 11 |
Closes: https://bugs.gentoo.org/860222 |
| 12 |
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de> |
| 13 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 14 |
|
| 15 |
....049.ebuild => fastjet-contrib-1.049-r1.ebuild} | 6 +- |
| 16 |
.../files/fastjet-contrib-1.049-ar.patch | 247 +++++++++++++++++++++ |
| 17 |
.../files/fastjet-contrib-1.049-soname.patch | 4 +- |
| 18 |
3 files changed, 253 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild |
| 21 |
similarity index 83% |
| 22 |
rename from sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild |
| 23 |
rename to sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild |
| 24 |
index cf942ac11e58..5327d49c484d 100644 |
| 25 |
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild |
| 26 |
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild |
| 27 |
@@ -22,12 +22,14 @@ RDEPEND="${DEPEND}" |
| 28 |
|
| 29 |
PATCHES=( |
| 30 |
"${FILESDIR}"/${P}-soname.patch |
| 31 |
+ "${FILESDIR}"/${P}-ar.patch |
| 32 |
) |
| 33 |
|
| 34 |
src_configure() { |
| 35 |
- CXX=`tc-getCXX` |
| 36 |
- ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die |
| 37 |
+ tc-export CXX AR RANLIB |
| 38 |
+ ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config RANLIB="${RANLIB}" AR="${AR}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die |
| 39 |
} |
| 40 |
+ |
| 41 |
src_compile() { |
| 42 |
emake |
| 43 |
emake fragile-shared |
| 44 |
|
| 45 |
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 |
| 46 |
new file mode 100644 |
| 47 |
index 000000000000..b7578bd76738 |
| 48 |
--- /dev/null |
| 49 |
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch |
| 50 |
@@ -0,0 +1,247 @@ |
| 51 |
+--- a/Centauro/Makefile |
| 52 |
++++ b/Centauro/Makefile |
| 53 |
+@@ -39,8 +39,8 @@ |
| 54 |
+ all: lib$(NAME).a |
| 55 |
+ |
| 56 |
+ lib$(NAME).a: $(OBJS) |
| 57 |
+- ar cru lib$(NAME).a $(OBJS) |
| 58 |
+- ranlib lib$(NAME).a |
| 59 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 60 |
++ $(RANLIB) lib$(NAME).a |
| 61 |
+ |
| 62 |
+ # building the examples |
| 63 |
+ examples: $(EXAMPLES) |
| 64 |
+--- a/ClusteringVetoPlugin/Makefile |
| 65 |
++++ b/ClusteringVetoPlugin/Makefile |
| 66 |
+@@ -39,8 +39,8 @@ |
| 67 |
+ all: lib$(NAME).a |
| 68 |
+ |
| 69 |
+ lib$(NAME).a: $(OBJS) |
| 70 |
+- ar cru lib$(NAME).a $(OBJS) |
| 71 |
+- ranlib lib$(NAME).a |
| 72 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 73 |
++ $(RANLIB) lib$(NAME).a |
| 74 |
+ |
| 75 |
+ # building the examples |
| 76 |
+ examples: $(EXAMPLES) |
| 77 |
+--- a/ConstituentSubtractor/Makefile |
| 78 |
++++ b/ConstituentSubtractor/Makefile |
| 79 |
+@@ -41,8 +41,8 @@ |
| 80 |
+ all: lib$(NAME).a |
| 81 |
+ |
| 82 |
+ lib$(NAME).a: $(OBJS) |
| 83 |
+- ar cru lib$(NAME).a $(OBJS) |
| 84 |
+- ranlib lib$(NAME).a |
| 85 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 86 |
++ $(RANLIB) lib$(NAME).a |
| 87 |
+ |
| 88 |
+ # building the examples |
| 89 |
+ examples: $(EXAMPLES) |
| 90 |
+--- a/EnergyCorrelator/Makefile |
| 91 |
++++ b/EnergyCorrelator/Makefile |
| 92 |
+@@ -40,8 +40,8 @@ |
| 93 |
+ all: lib$(NAME).a |
| 94 |
+ |
| 95 |
+ lib$(NAME).a: $(OBJS) |
| 96 |
+- ar cru lib$(NAME).a $(OBJS) |
| 97 |
+- ranlib lib$(NAME).a |
| 98 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 99 |
++ $(RANLIB) lib$(NAME).a |
| 100 |
+ |
| 101 |
+ # building the examples |
| 102 |
+ examples: $(EXAMPLES) |
| 103 |
+--- a/FlavorCone/Makefile |
| 104 |
++++ b/FlavorCone/Makefile |
| 105 |
+@@ -39,8 +39,8 @@ |
| 106 |
+ all: lib$(NAME).a |
| 107 |
+ |
| 108 |
+ lib$(NAME).a: $(OBJS) |
| 109 |
+- ar cru lib$(NAME).a $(OBJS) |
| 110 |
+- ranlib lib$(NAME).a |
| 111 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 112 |
++ $(RANLIB) lib$(NAME).a |
| 113 |
+ |
| 114 |
+ # building the examples |
| 115 |
+ examples: $(EXAMPLES) |
| 116 |
+--- a/GenericSubtractor/Makefile |
| 117 |
++++ b/GenericSubtractor/Makefile |
| 118 |
+@@ -38,8 +38,8 @@ |
| 119 |
+ all: lib$(NAME).a |
| 120 |
+ |
| 121 |
+ lib$(NAME).a: $(OBJS) |
| 122 |
+- ar cru lib$(NAME).a $(OBJS) |
| 123 |
+- ranlib lib$(NAME).a |
| 124 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 125 |
++ $(RANLIB) lib$(NAME).a |
| 126 |
+ |
| 127 |
+ # building the examples |
| 128 |
+ examples: $(EXAMPLES) |
| 129 |
+--- a/JetCleanser/Makefile |
| 130 |
++++ b/JetCleanser/Makefile |
| 131 |
+@@ -39,8 +39,8 @@ |
| 132 |
+ all: lib$(NAME).a |
| 133 |
+ |
| 134 |
+ lib$(NAME).a: $(OBJS) |
| 135 |
+- ar cru lib$(NAME).a $(OBJS) |
| 136 |
+- ranlib lib$(NAME).a |
| 137 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 138 |
++ $(RANLIB) lib$(NAME).a |
| 139 |
+ |
| 140 |
+ # building the examples |
| 141 |
+ examples: $(EXAMPLES) |
| 142 |
+--- a/JetFFMoments/Makefile |
| 143 |
++++ b/JetFFMoments/Makefile |
| 144 |
+@@ -34,8 +34,8 @@ |
| 145 |
+ all: lib$(NAME).a |
| 146 |
+ |
| 147 |
+ lib$(NAME).a: $(OBJS) |
| 148 |
+- ar cru lib$(NAME).a $(OBJS) |
| 149 |
+- ranlib lib$(NAME).a |
| 150 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 151 |
++ $(RANLIB) lib$(NAME).a |
| 152 |
+ |
| 153 |
+ examples: example |
| 154 |
+ |
| 155 |
+--- a/JetsWithoutJets/Makefile |
| 156 |
++++ b/JetsWithoutJets/Makefile |
| 157 |
+@@ -39,8 +39,8 @@ |
| 158 |
+ all: lib$(NAME).a |
| 159 |
+ |
| 160 |
+ lib$(NAME).a: $(OBJS) |
| 161 |
+- ar cru lib$(NAME).a $(OBJS) |
| 162 |
+- ranlib lib$(NAME).a |
| 163 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 164 |
++ $(RANLIB) lib$(NAME).a |
| 165 |
+ |
| 166 |
+ # building the examples |
| 167 |
+ examples: $(EXAMPLES) |
| 168 |
+--- a/LundPlane/Makefile |
| 169 |
++++ b/LundPlane/Makefile |
| 170 |
+@@ -39,8 +39,8 @@ |
| 171 |
+ all: lib$(NAME).a |
| 172 |
+ |
| 173 |
+ lib$(NAME).a: $(OBJS) |
| 174 |
+- ar cru lib$(NAME).a $(OBJS) |
| 175 |
+- ranlib lib$(NAME).a |
| 176 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 177 |
++ $(RANLIB) lib$(NAME).a |
| 178 |
+ |
| 179 |
+ # building the examples |
| 180 |
+ examples: $(EXAMPLES) |
| 181 |
+--- a/Nsubjettiness/Makefile |
| 182 |
++++ b/Nsubjettiness/Makefile |
| 183 |
+@@ -40,8 +40,8 @@ |
| 184 |
+ all: lib$(NAME).a |
| 185 |
+ |
| 186 |
+ lib$(NAME).a: $(OBJS) |
| 187 |
+- ar cru lib$(NAME).a $(OBJS) |
| 188 |
+- ranlib lib$(NAME).a |
| 189 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 190 |
++ $(RANLIB) lib$(NAME).a |
| 191 |
+ |
| 192 |
+ # building the examples |
| 193 |
+ examples: $(EXAMPLES) $(EXAMPLES2) |
| 194 |
+--- a/QCDAwarePlugin/Makefile |
| 195 |
++++ b/QCDAwarePlugin/Makefile |
| 196 |
+@@ -39,8 +39,8 @@ |
| 197 |
+ all: lib$(NAME).a |
| 198 |
+ |
| 199 |
+ lib$(NAME).a: $(OBJS) |
| 200 |
+- ar cru lib$(NAME).a $(OBJS) |
| 201 |
+- ranlib lib$(NAME).a |
| 202 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 203 |
++ $(RANLIB) lib$(NAME).a |
| 204 |
+ |
| 205 |
+ # building the examples |
| 206 |
+ examples: $(EXAMPLES) |
| 207 |
+--- a/RecursiveTools/Makefile |
| 208 |
++++ b/RecursiveTools/Makefile |
| 209 |
+@@ -39,8 +39,8 @@ |
| 210 |
+ all: lib$(NAME).a |
| 211 |
+ |
| 212 |
+ lib$(NAME).a: $(OBJS) |
| 213 |
+- ar cru lib$(NAME).a $(OBJS) |
| 214 |
+- ranlib lib$(NAME).a |
| 215 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 216 |
++ $(RANLIB) lib$(NAME).a |
| 217 |
+ |
| 218 |
+ # building the examples |
| 219 |
+ examples: $(EXAMPLES) |
| 220 |
+--- a/ScJet/Makefile |
| 221 |
++++ b/ScJet/Makefile |
| 222 |
+@@ -39,8 +39,8 @@ |
| 223 |
+ all: lib$(NAME).a |
| 224 |
+ |
| 225 |
+ lib$(NAME).a: $(OBJS) |
| 226 |
+- ar cru lib$(NAME).a $(OBJS) |
| 227 |
+- ranlib lib$(NAME).a |
| 228 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 229 |
++ $(RANLIB) lib$(NAME).a |
| 230 |
+ |
| 231 |
+ # building the examples |
| 232 |
+ examples: $(EXAMPLES) |
| 233 |
+--- a/scripts/internal/Template/Makefile |
| 234 |
++++ b/scripts/internal/Template/Makefile |
| 235 |
+@@ -39,8 +39,8 @@ |
| 236 |
+ all: lib$(NAME).a |
| 237 |
+ |
| 238 |
+ lib$(NAME).a: $(OBJS) |
| 239 |
+- ar cru lib$(NAME).a $(OBJS) |
| 240 |
+- ranlib lib$(NAME).a |
| 241 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 242 |
++ $(RANLIB) lib$(NAME).a |
| 243 |
+ |
| 244 |
+ # building the examples |
| 245 |
+ examples: $(EXAMPLES) |
| 246 |
+--- a/SoftKiller/Makefile |
| 247 |
++++ b/SoftKiller/Makefile |
| 248 |
+@@ -39,8 +39,8 @@ |
| 249 |
+ all: lib$(NAME).a |
| 250 |
+ |
| 251 |
+ lib$(NAME).a: $(OBJS) |
| 252 |
+- ar cru lib$(NAME).a $(OBJS) |
| 253 |
+- ranlib lib$(NAME).a |
| 254 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 255 |
++ $(RANLIB) lib$(NAME).a |
| 256 |
+ |
| 257 |
+ # building the examples |
| 258 |
+ examples: $(EXAMPLES) |
| 259 |
+--- a/SubjetCounting/Makefile |
| 260 |
++++ b/SubjetCounting/Makefile |
| 261 |
+@@ -39,8 +39,8 @@ |
| 262 |
+ all: lib$(NAME).a |
| 263 |
+ |
| 264 |
+ lib$(NAME).a: $(OBJS) |
| 265 |
+- ar cru lib$(NAME).a $(OBJS) |
| 266 |
+- ranlib lib$(NAME).a |
| 267 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 268 |
++ $(RANLIB) lib$(NAME).a |
| 269 |
+ |
| 270 |
+ # building the examples |
| 271 |
+ examples: $(EXAMPLES) |
| 272 |
+--- a/ValenciaPlugin/Makefile |
| 273 |
++++ b/ValenciaPlugin/Makefile |
| 274 |
+@@ -39,8 +39,8 @@ |
| 275 |
+ all: lib$(NAME).a |
| 276 |
+ |
| 277 |
+ lib$(NAME).a: $(OBJS) |
| 278 |
+- ar cru lib$(NAME).a $(OBJS) |
| 279 |
+- ranlib lib$(NAME).a |
| 280 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 281 |
++ $(RANLIB) lib$(NAME).a |
| 282 |
+ |
| 283 |
+ # building the examples |
| 284 |
+ examples: $(EXAMPLES) |
| 285 |
+--- a/VariableR/Makefile |
| 286 |
++++ b/VariableR/Makefile |
| 287 |
+@@ -39,8 +39,8 @@ |
| 288 |
+ all: lib$(NAME).a |
| 289 |
+ |
| 290 |
+ lib$(NAME).a: $(OBJS) |
| 291 |
+- ar cru lib$(NAME).a $(OBJS) |
| 292 |
+- ranlib lib$(NAME).a |
| 293 |
++ $(AR) cru lib$(NAME).a $(OBJS) |
| 294 |
++ $(RANLIB) lib$(NAME).a |
| 295 |
+ |
| 296 |
+ # building the examples |
| 297 |
+ examples: $(EXAMPLES) |
| 298 |
|
| 299 |
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 |
| 300 |
index 5f69900cdc30..fe3794d5e0f5 100644 |
| 301 |
--- a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch |
| 302 |
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch |
| 303 |
@@ -1,5 +1,5 @@ |
| 304 |
---- fjcontrib-1.046.orig/Makefile.in 2022-03-10 13:44:33.963887464 +0100 |
| 305 |
-+++ fjcontrib-1.046/Makefile.in 2022-03-10 13:45:02.573890763 +0100 |
| 306 |
+--- a/Makefile.in |
| 307 |
++++ b/Makefile.in |
| 308 |
@@ -54,7 +54,7 @@ |
| 309 |
|
| 310 |
fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@ |
Archives