Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Haelwenn Monnier <contact@×××××××××.me>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/sionlib/files/
Date: Sun, 29 Aug 2021 17:06:03
Message-Id: 1630197213.45360dcfcc0b88484a72fc357a78c7c159f105d1.lanodan@gentoo
1 commit: 45360dcfcc0b88484a72fc357a78c7c159f105d1
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 29 00:32:41 2021 +0000
4 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
5 CommitDate: Sun Aug 29 00:33:33 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=45360dcf
7
8 sys-cluster/sionlib: fix library linking
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 .../files/sionlib-build-shared-libraries.patch | 66 +++++++++++++---------
13 1 file changed, 38 insertions(+), 28 deletions(-)
14
15 diff --git a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
16 index 9c1895499..2f41d58c1 100644
17 --- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
18 +++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
19 @@ -1,6 +1,5 @@
20 -diff '--color=auto' -ru sionlib-ori/src/cppinterface/Makefile sionlib/src/cppinterface/Makefile
21 ---- sionlib-ori/src/cppinterface/Makefile 2021-08-29 01:04:54.919546800 +0200
22 -+++ sionlib/src/cppinterface/Makefile 2021-08-29 00:44:20.564541936 +0200
23 +--- a/src/cppinterface/Makefile
24 ++++ b/src/cppinterface/Makefile
25 @@ -30,7 +30,7 @@
26 ifeq ($(CXXENABLE),1)
27
28 @@ -36,9 +35,8 @@ diff '--color=auto' -ru sionlib-ori/src/cppinterface/Makefile sionlib/src/cppint
29
30 #------------------------------------------------------------------------------
31 # Dependencies
32 -diff '--color=auto' -ru sionlib-ori/src/fortraninterface/Makefile sionlib/src/fortraninterface/Makefile
33 ---- sionlib-ori/src/fortraninterface/Makefile 2021-08-29 01:04:54.928546844 +0200
34 -+++ sionlib/src/fortraninterface/Makefile 2021-08-29 01:21:47.153471098 +0200
35 +--- a/src/fortraninterface/Makefile
36 ++++ b/src/fortraninterface/Makefile
37 @@ -39,7 +39,7 @@
38
39 USER_HDRS = sion_f77.H sion_f77.h
40 @@ -52,24 +50,24 @@ diff '--color=auto' -ru sionlib-ori/src/fortraninterface/Makefile sionlib/src/fo
41 SION_OBJS_F77_SER += sion_f77_omp.o sion_fortran_omp.o
42 SION_OBJS_F90_SER += sion_f90_omp.o sion_fortran_omp.o
43 USER_MODS += sion_f90_omp.mod
44 -+ F77_SER_LIBS = $(OMPFLAG) -l$(SION_LIBNAME_OMP)
45 -+ F90_SER_LIBS = $(OMPFLAG) -l$(SION_LIBNAME_OMP)
46 ++ F77_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
47 ++ F90_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
48 endif
49
50 ifeq ($(MPIENABLE),1)
51 SION_OBJS_F77_MPI += sion_f77_mpi.o sion_fortran_mpi.o sion_fortran_writeread_mpi_f77.o
52 SION_OBJS_F90_MPI += sion_f90_mpi.o sion_fortran_mpi.o sion_fortran_writeread_mpi_f90.o
53 USER_MODS += sion_f90_mpi.mod
54 -+ F77_MPI_LIBS = -l$(SION_LIBNAME_MPI)
55 -+ F90_MPI_LIBS = -l$(SION_LIBNAME_MPI)
56 ++ F77_MPI_LIBS = -L../parlib -l$(SION_LIBNAME_MPI)
57 ++ F90_MPI_LIBS = -L../parlib -l$(SION_LIBNAME_MPI)
58 endif
59
60 ifeq ($(HYBENABLE),1)
61 SION_OBJS_F77_MPI += sion_f77_ompi.o sion_fortran_ompi.o
62 SION_OBJS_F90_MPI += sion_f90_ompi.o sion_fortran_ompi.o
63 USER_MODS += sion_f90_ompi.mod
64 -+ F77_MPI_LIBS = $(HYBFLAG) -l$(SION_LIBNAME_OMPI)
65 -+ F90_MPI_LIBS = $(HYBFLAG) -l$(SION_LIBNAME_OMPI)
66 ++ F77_MPI_LIBS = $(HYBFLAG) -L../parlib -l$(SION_LIBNAME_OMPI)
67 ++ F90_MPI_LIBS = $(HYBFLAG) -L../parlib -l$(SION_LIBNAME_OMPI)
68 endif
69
70 SION_DEPEND_OBJS=sion_fortran.o sion_fortran_omp.o sion_fortran_mpi.o sion_fortran_ompi.o sion_fortran_writeread_f77.o sion_fortran_writeread_f90.o sion_fortran_writeread_mpi_f77.o sion_fortran_writeread_mpi_f90.o
71 @@ -111,9 +109,8 @@ diff '--color=auto' -ru sionlib-ori/src/fortraninterface/Makefile sionlib/src/fo
72
73 #------------------------------------------------------------------------------
74 # Dependencies
75 -diff '--color=auto' -ru sionlib-ori/src/lib/Makefile sionlib/src/lib/Makefile
76 ---- sionlib-ori/src/lib/Makefile 2021-08-29 01:04:54.930546854 +0200
77 -+++ sionlib/src/lib/Makefile 2021-08-29 00:44:20.574541984 +0200
78 +--- a/src/lib/Makefile
79 ++++ b/src/lib/Makefile
80 @@ -67,25 +67,25 @@
81 endif
82
83 @@ -159,9 +156,8 @@ diff '--color=auto' -ru sionlib-ori/src/lib/Makefile sionlib/src/lib/Makefile
84
85 #------------------------------------------------------------------------------
86 # Dependencies
87 -diff '--color=auto' -ru sionlib-ori/src/parlib/Makefile sionlib/src/parlib/Makefile
88 ---- sionlib-ori/src/parlib/Makefile 2021-08-29 01:04:54.921546810 +0200
89 -+++ sionlib/src/parlib/Makefile 2021-08-29 01:03:58.041270101 +0200
90 +--- a/src/parlib/Makefile
91 ++++ b/src/parlib/Makefile
92 @@ -29,7 +29,7 @@
93 .SUFFIXES: .cpp .c .f
94
95 @@ -247,10 +243,23 @@ diff '--color=auto' -ru sionlib-ori/src/parlib/Makefile sionlib/src/parlib/Makef
96
97 #------------------------------------------------------------------------------
98 # Dependencies
99 -diff '--color=auto' -ru sionlib-ori/src/parutils/Makefile sionlib/src/parutils/Makefile
100 ---- sionlib-ori/src/parutils/Makefile 2021-08-29 01:04:54.928546844 +0200
101 -+++ sionlib/src/parutils/Makefile 2021-08-29 00:44:20.571541969 +0200
102 -@@ -75,10 +75,10 @@
103 +--- a/src/parutils/Makefile
104 ++++ b/src/parutils/Makefile
105 +@@ -55,6 +55,13 @@
106 + ifeq ($(FORTRANENABLE),1)
107 + ifeq ($(MPIENABLE),1)
108 + USER_UTILS += fpartest
109 ++ F77_MPI_LIBS = -L../parlib -l$(SION_LIBNAME_MPI)
110 ++ endif
111 ++ ifeq ($(OMPENABLE),1)
112 ++ F77_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
113 ++ endif
114 ++ ifeq ($(HYBENABLE),1)
115 ++ F77_MPI_LIBS = $(HYBFLAG) -L../parlib -l$(SION_LIBNAME_OMPI)
116 + endif
117 + endif
118 +
119 +@@ -75,10 +82,10 @@
120
121 all: $(USER_UTILS)
122
123 @@ -263,16 +272,18 @@ diff '--color=auto' -ru sionlib-ori/src/parutils/Makefile sionlib/src/parutils/M
124 $(HYBCC) -o $@ $(PARTEST_OMPI_OBJS) $(CHYBLDFLAGS) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_SER) $(MPILIB)
125
126 ompi_partest.o : ompi_partest.c
127 -@@ -114,7 +114,7 @@
128 +@@ -114,8 +121,8 @@
129 fpartest.o : fpartest.F90
130 $(MPIF90) $(FFLAGS) -c fpartest.F90
131
132 -fpartest: fpartest.o ../parlib/lib$(SION_LIBNAME_MPI).a ../parlib/lib$(SION_LIBNAME_GEN).a ../lib/lib$(SION_LIBNAME_SER).a ../fortraninterface/lib$(SION_LIBNAME_F77_MPI).a ../fortraninterface/lib$(SION_LIBNAME_F77_SER).a
133 +- $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB)
134 +fpartest: fpartest.o ../parlib/lib$(SION_LIBNAME_MPI).so ../parlib/lib$(SION_LIBNAME_GEN).so ../lib/lib$(SION_LIBNAME_SER).so ../fortraninterface/lib$(SION_LIBNAME_F77_MPI).so ../fortraninterface/lib$(SION_LIBNAME_F77_SER).so
135 - $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB)
136 ++ $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB) $(F77_MPI_LIBS) $(F77_SER_LIBS)
137
138
139 -@@ -161,7 +161,7 @@
140 + install: all
141 +@@ -161,7 +168,7 @@
142 @rm -f header.tmp
143
144 clean:
145 @@ -281,9 +292,8 @@ diff '--color=auto' -ru sionlib-ori/src/parutils/Makefile sionlib/src/parutils/M
146
147 #------------------------------------------------------------------------------
148 # Dependencies
149 -diff '--color=auto' -ru sionlib-ori/src/utils/Makefile sionlib/src/utils/Makefile
150 ---- sionlib-ori/src/utils/Makefile 2021-08-29 01:04:54.925546830 +0200
151 -+++ sionlib/src/utils/Makefile 2021-08-29 00:44:20.568541955 +0200
152 +--- a/src/utils/Makefile
153 ++++ b/src/utils/Makefile
154 @@ -45,32 +45,32 @@
155 siondump.o : siondump.c
156 $(CC) $(CFLAGS) -c siondump.c
Report Message
Find on MARC Find on Google Groups