| 1 |
commit: 48659d8631678c1a7cde4e729683f0b819098497 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Mar 31 10:07:04 2022 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Mar 31 10:07:43 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=48659d86 |
| 7 |
|
| 8 |
sys-cluster/mrnet: EAPI 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/802237 |
| 11 |
Closes: https://bugs.gentoo.org/802228 |
| 12 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 13 |
|
| 14 |
.../mrnet-5.0.1_p20180510-respect-LDFLAGS.patch | 133 +++++++++++++++++++++ |
| 15 |
...0-r3.ebuild => mrnet-5.0.1_p20180510-r4.ebuild} | 13 +- |
| 16 |
2 files changed, 142 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/mrnet/files/mrnet-5.0.1_p20180510-respect-LDFLAGS.patch b/sys-cluster/mrnet/files/mrnet-5.0.1_p20180510-respect-LDFLAGS.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000..1e6a7f95a |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-cluster/mrnet/files/mrnet-5.0.1_p20180510-respect-LDFLAGS.patch |
| 23 |
@@ -0,0 +1,133 @@ |
| 24 |
+--- a/conf/Makefile.in |
| 25 |
++++ b/conf/Makefile.in |
| 26 |
+@@ -497,7 +497,7 @@ |
| 27 |
+ |
| 28 |
+ $(LIBMRNET_SO): $(LIBMRNET_OBJS) $(LIBXPLAT_SO) |
| 29 |
+ @echo Building `basename $@` ... |
| 30 |
+- $(CXX) -Wl,-soname,$(LIBMRNET_SONAME) $(SOFLAGS) -o $@ $(LIBMRNET_OBJS) $(LIBMRNET_SO_DEPLIBS) |
| 31 |
++ $(CXX) -Wl,-soname,$(LIBMRNET_SONAME) $(SOFLAGS) $(LDFLAGS) -o $@ $(LIBMRNET_OBJS) $(LIBMRNET_SO_DEPLIBS) |
| 32 |
+ |
| 33 |
+ $(LIBXPLAT): xplat-all |
| 34 |
+ |
| 35 |
+@@ -556,7 +556,7 @@ |
| 36 |
+ |
| 37 |
+ $(LIBDIR)/test_DynamicFilters.so: $(TSTDIR)/test_DynamicFilters.C |
| 38 |
+ @echo "Building `basename $@` ..." |
| 39 |
+- $(CXX) $(CXXFLAGS) $(SOFLAGS) -o $@ $(TSTDIR)/test_DynamicFilters.C |
| 40 |
++ $(CXX) $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) -o $@ $(TSTDIR)/test_DynamicFilters.C |
| 41 |
+ |
| 42 |
+ $(BINDIR)/test_Recovery_FE: $(BINDIR)/%: $(CNDEP) $(OBJDIR)/%.o \ |
| 43 |
+ $(OBJDIR)/test_Recovery.o \ |
| 44 |
+@@ -578,7 +578,7 @@ |
| 45 |
+ |
| 46 |
+ $(LIBDIR)/test_RecoveryFilter.so: $(TSTDIR)/test_Recovery/test_RecoveryFilter.C |
| 47 |
+ @echo "Building `basename $@` ..." |
| 48 |
+- $(CXX) $(CXXFLAGS) $(SOFLAGS) -o $@ $(TSTDIR)/test_Recovery/test_RecoveryFilter.C |
| 49 |
++ $(CXX) $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) -o $@ $(TSTDIR)/test_Recovery/test_RecoveryFilter.C |
| 50 |
+ |
| 51 |
+ ################################# |
| 52 |
+ # Cleaning rules |
| 53 |
+--- a/conf/Makefile.ltwt.in |
| 54 |
++++ b/conf/Makefile.ltwt.in |
| 55 |
+@@ -101,11 +101,11 @@ |
| 56 |
+ |
| 57 |
+ $(TARGET_SO): $(LTWT_OBJS) |
| 58 |
+ @echo Building `basename $@` ... |
| 59 |
+- $(CC) -Wl,-soname,$(TARGET_SONAME) $(SOFLAGS) -o $@ $^ $(TARGET_SO_DEPLIBS) |
| 60 |
++ $(CC) -Wl,-soname,$(TARGET_SONAME) $(SOFLAGS) $(LDFLAGS) -o $@ $^ $(TARGET_SO_DEPLIBS) |
| 61 |
+ |
| 62 |
+ $(TARGET_SO_LOWFAT): $(LOWFAT_OBJS) |
| 63 |
+ @echo Building `basename $@` ... |
| 64 |
+- $(CC) -Wl,-soname,$(TARGET_SONAME_LOWFAT) $(SOFLAGS) -o $@ $^ $(TARGET_SO_LOWFAT_DEPLIBS) |
| 65 |
++ $(CC) -Wl,-soname,$(TARGET_SONAME_LOWFAT) $(SOFLAGS) $(LDFLAGS) -o $@ $^ $(TARGET_SO_LOWFAT_DEPLIBS) |
| 66 |
+ |
| 67 |
+ install-prep: |
| 68 |
+ for dir in $(ILIBDIR) $(install_INCDIR) $(install_libincdir) ; do \ |
| 69 |
+--- a/Examples/FaultRecovery/Makefile |
| 70 |
++++ b/Examples/FaultRecovery/Makefile |
| 71 |
+@@ -24,7 +24,7 @@ |
| 72 |
+ $(CC) $(CCFLAGS) $(LDFLAGS) -o $@ FaultRecovery_BE_lightweight.c $(LIBS_LIGHTWEIGHT) |
| 73 |
+ |
| 74 |
+ $(LIBDIR)/FaultRecoveryFilter.so: FaultRecoveryFilter.C |
| 75 |
+- $(CXX) $(CXXFLAGS) $(SOFLAGS) -o $@ FaultRecoveryFilter.C |
| 76 |
++ $(CXX) $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) -o $@ FaultRecoveryFilter.C |
| 77 |
+ |
| 78 |
+ clean: |
| 79 |
+ $(RM) -f $(TARGETS) $(TARGETS_SO) |
| 80 |
+--- a/Examples/HeterogeneousFilters/Makefile |
| 81 |
++++ b/Examples/HeterogeneousFilters/Makefile |
| 82 |
+@@ -21,7 +21,7 @@ |
| 83 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ HeteroFilters_BE.C $(LIBS) |
| 84 |
+ |
| 85 |
+ $(LIBDIR)/HeteroFilters.so: HeteroFilters.C |
| 86 |
+- $(CXX) $(CXXFLAGS) $(SOFLAGS) -o $@ HeteroFilters.C |
| 87 |
++ $(CXX) $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) -o $@ HeteroFilters.C |
| 88 |
+ |
| 89 |
+ clean: |
| 90 |
+ $(RM) -f $(TARGETS) $(TARGETS_SO) |
| 91 |
+--- a/Examples/IntegerAddition/Makefile |
| 92 |
++++ b/Examples/IntegerAddition/Makefile |
| 93 |
+@@ -40,7 +40,7 @@ |
| 94 |
+ $(CC) $(CCFLAGS) $(LDFLAGS) -o $@ IntegerAddition_BE_lightweight.c $(LIBS_LIGHTWEIGHT) |
| 95 |
+ |
| 96 |
+ $(LIBDIR)/IntegerAdditionFilter.so: IntegerAdditionFilter.C |
| 97 |
+- $(CXX) $(CXXFLAGS) $(SOFLAGS) -o $@ IntegerAdditionFilter.C |
| 98 |
++ $(CXX) $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) -o $@ IntegerAdditionFilter.C |
| 99 |
+ |
| 100 |
+ clean: |
| 101 |
+ $(RM) -f $(TARGETS) $(TARGETS_SO) |
| 102 |
+--- a/Examples/PerformanceData/Makefile |
| 103 |
++++ b/Examples/PerformanceData/Makefile |
| 104 |
+@@ -24,7 +24,7 @@ |
| 105 |
+ $(CC) $(CCFLAGS) $(LDFLAGS) -o $@ BE_lightweight.c $(LIBS_LIGHTWEIGHT) |
| 106 |
+ |
| 107 |
+ $(LIBDIR)/PerfDataFilter.so: PerfDataFilter.C |
| 108 |
+- $(CXX) $(CXXFLAGS) $(SOFLAGS) -o $@ PerfDataFilter.C |
| 109 |
++ $(CXX) $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) -o $@ PerfDataFilter.C |
| 110 |
+ |
| 111 |
+ clean: |
| 112 |
+ $(RM) -f $(TARGETS) $(TARGETS_SO) |
| 113 |
+--- a/Examples/PerThreadStreams/Makefile |
| 114 |
++++ b/Examples/PerThreadStreams/Makefile |
| 115 |
+@@ -27,7 +27,7 @@ |
| 116 |
+ $(CC) -g $(CCFLAGS) $(LDFLAGS) -o $@ PerThreadStreams_BE_lightweight.c $(LIBS_LOWFAT) |
| 117 |
+ |
| 118 |
+ $(LIBDIR)/PerThreadStreamsFilter.so: PerThreadStreamsFilter.C |
| 119 |
+- $(CXX) -g $(CXXFLAGS) $(SOFLAGS) -o $@ PerThreadStreamsFilter.C |
| 120 |
++ $(CXX) -g $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) -o $@ PerThreadStreamsFilter.C |
| 121 |
+ |
| 122 |
+ clean: |
| 123 |
+ $(RM) -f $(TARGETS) $(TARGETS_SO) |
| 124 |
+--- a/xplat/conf/Makefile.in |
| 125 |
++++ b/xplat/conf/Makefile.in |
| 126 |
+@@ -1,4 +1,4 @@ |
| 127 |
+-#/**************************************************************************** |
| 128 |
++# **************************************************************************** |
| 129 |
+ # * Copyright © 2003-2012 Dorian C. Arnold, Philip C. Roth, Barton P. Miller * |
| 130 |
+ # * Detailed MRNet usage rights in "LICENSE" file. * |
| 131 |
+ # ****************************************************************************/ |
| 132 |
+@@ -105,7 +105,7 @@ |
| 133 |
+ |
| 134 |
+ $(TARGET_SO): $(XPLAT_OBJS) |
| 135 |
+ @echo Building `basename $@` ... |
| 136 |
+- $(CXX) -Wl,-soname,$(TARGET_SONAME) $(SOFLAGS) -o $@ $(XPLAT_OBJS) $(TARGET_SO_DEPLIBS) |
| 137 |
++ $(CXX) -Wl,-soname,$(TARGET_SONAME) $(SOFLAGS) $(LDFLAGS) -o $@ $(XPLAT_OBJS) $(TARGET_SO_DEPLIBS) |
| 138 |
+ |
| 139 |
+ install-prep: |
| 140 |
+ for dir in $(ILIBDIR) $(install_INCDIR) $(install_LIBINCDIR) ; do \ |
| 141 |
+--- a/xplat/conf/Makefile.ltwt.in |
| 142 |
++++ b/xplat/conf/Makefile.ltwt.in |
| 143 |
+@@ -95,11 +95,11 @@ |
| 144 |
+ |
| 145 |
+ $(TARGET_SO): $(XPLAT_LTWT_OBJS) |
| 146 |
+ @echo Building `basename $@` ... |
| 147 |
+- $(CC) -Wl,-soname,$(TARGET_SONAME) $(SOFLAGS) -o $@ $^ $(TARGET_SO_LIBS) |
| 148 |
++ $(CC) -Wl,-soname,$(TARGET_SONAME) $(SOFLAGS) $(LDFLAGS) -o $@ $^ $(TARGET_SO_LIBS) |
| 149 |
+ |
| 150 |
+ $(TARGET_SO_LOWFAT): $(XPLAT_LOWFAT_OBJS) |
| 151 |
+ @echo Building `basename $@` ... |
| 152 |
+- $(CC) -Wl,-soname,$(TARGET_SONAME_LOWFAT) $(SOFLAGS) -o $@ $^ $(TARGET_SO_LOWFAT_LIBS) |
| 153 |
++ $(CC) -Wl,-soname,$(TARGET_SONAME_LOWFAT) $(SOFLAGS) $(LDFLAGS) -o $@ $^ $(TARGET_SO_LOWFAT_LIBS) |
| 154 |
+ |
| 155 |
+ install-prep: |
| 156 |
+ for dir in $(ILIBDIR) $(install_INCDIR) $(install_LIBINCDIR) ; do \ |
| 157 |
|
| 158 |
diff --git a/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r3.ebuild b/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r4.ebuild |
| 159 |
similarity index 87% |
| 160 |
rename from sys-cluster/mrnet/mrnet-5.0.1_p20180510-r3.ebuild |
| 161 |
rename to sys-cluster/mrnet/mrnet-5.0.1_p20180510-r4.ebuild |
| 162 |
index 2cbbb0a0b..0bc6abcc1 100644 |
| 163 |
--- a/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r3.ebuild |
| 164 |
+++ b/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r4.ebuild |
| 165 |
@@ -1,11 +1,11 @@ |
| 166 |
-# Copyright 2019-2021 Gentoo Authors |
| 167 |
+# Copyright 2019-2028 Gentoo Authors |
| 168 |
# Distributed under the terms of the GNU General Public License v2 |
| 169 |
|
| 170 |
-EAPI=7 |
| 171 |
+EAPI=8 |
| 172 |
|
| 173 |
COMMIT="7375ba5bb0df87c68e58ad15e9e5e351ae020c08" |
| 174 |
|
| 175 |
-inherit flag-o-matic |
| 176 |
+inherit flag-o-matic toolchain-funcs |
| 177 |
|
| 178 |
DESCRIPTION="A Multicast/Reduction Network" |
| 179 |
HOMEPAGE="http://www.paradyn.org/mrnet" |
| 180 |
@@ -29,7 +29,10 @@ DEPEND=" |
| 181 |
slurm? ( sys-cluster/slurm ) |
| 182 |
" |
| 183 |
|
| 184 |
-PATCHES=( "${FILESDIR}/${PN}-no-libi.patch" ) |
| 185 |
+PATCHES=( |
| 186 |
+ "${FILESDIR}/${P}-respect-LDFLAGS.patch" |
| 187 |
+ "${FILESDIR}/${PN}-no-libi.patch" |
| 188 |
+) |
| 189 |
REQUIRED_USE="slurm? ( libi )" |
| 190 |
|
| 191 |
src_prepare() { |
| 192 |
@@ -38,6 +41,8 @@ src_prepare() { |
| 193 |
} |
| 194 |
|
| 195 |
src_configure() { |
| 196 |
+ tc-export AR CC CXX |
| 197 |
+ |
| 198 |
use libi && append-cxxflags "-llibi" |
| 199 |
local myconf=( |
| 200 |
--enable-shared |
Archives