1 |
commit: f97bb147c9e7d1ae7a0cafae40ab2d891b970dc8 |
2 |
Author: Patrick J Taylor <patrick.joseph.taylor <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Sep 13 18:25:51 2022 +0000 |
4 |
Commit: Patrick Taylor <patrick.joseph.taylor <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Sep 13 18:27:24 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f97bb147 |
7 |
|
8 |
sci-chemistry/xcrysden: edit Makefiles to respect LDFLAGS |
9 |
|
10 |
Closes: https://bugs.gentoo.org/869947 |
11 |
Signed-off-by: Patrick J Taylor <patrick.joseph.taylor <AT> gmail.com> |
12 |
|
13 |
.../xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch | 171 +++++++++++++++++++++ |
14 |
sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 1 + |
15 |
2 files changed, 172 insertions(+) |
16 |
|
17 |
diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch |
18 |
new file mode 100644 |
19 |
index 000000000..1ae39ae5e |
20 |
--- /dev/null |
21 |
+++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch |
22 |
@@ -0,0 +1,171 @@ |
23 |
+diff --git a/C/Makefile b/C/Makefile |
24 |
+index 2aa0307..452e0f1 100644 |
25 |
+--- a/C/Makefile |
26 |
++++ b/C/Makefile |
27 |
+@@ -12,7 +12,7 @@ include make-objects |
28 |
+ |
29 |
+ .SUFFIXES: .o .c |
30 |
+ .c.o: |
31 |
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $< |
32 |
++ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $< |
33 |
+ |
34 |
+ objects = $(XC_OBJS) $(EXTERNAL_OBJS) |
35 |
+ |
36 |
+@@ -24,18 +24,18 @@ compile: |
37 |
+ #objects: $(objects) |
38 |
+ # |
39 |
+ #$(objects): %.o: %.c |
40 |
+-# $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $< |
41 |
++# $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $< |
42 |
+ |
43 |
+ xcrys: $(XC_OBJS) $(EXTERNAL_OBJS) |
44 |
+- $(CC) $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \ |
45 |
++ $(CC) $(LDFLAGS) $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \ |
46 |
+ -o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(TOGL_LIB) $(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB) $(EXT_LIB) |
47 |
+ |
48 |
+ xctclsh: xcTclsh.o |
49 |
+- $(CC) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB) |
50 |
++ $(CC) $(LDFLAGS) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB) |
51 |
+ |
52 |
+ XFS_OBJS = xsf2xsf.o |
53 |
+ xsf2xsf: $(XFS_OBJS) |
54 |
+- $(CC) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB) |
55 |
++ $(CC) $(LDFLAGS) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB) |
56 |
+ |
57 |
+ |
58 |
+ install: |
59 |
+diff --git a/F/Makefile b/F/Makefile |
60 |
+index 3f8270e..92f17d1 100644 |
61 |
+--- a/F/Makefile |
62 |
++++ b/F/Makefile |
63 |
+@@ -4,10 +4,10 @@ include ../Make.sys |
64 |
+ .SUFFIXES : .o .f .f90 |
65 |
+ |
66 |
+ .f90.o: |
67 |
+- $(FC) $(FFLAGS) -c $< |
68 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -c $< |
69 |
+ |
70 |
+ .f.o: |
71 |
+- $(FC) $(FFLAGS) -c $< |
72 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -c $< |
73 |
+ |
74 |
+ OBJ = gengeom.o \ |
75 |
+ multhexa.o \ |
76 |
+@@ -73,70 +73,70 @@ spaghetti: |
77 |
+ cd SRC_spaghetti; $(MAKE) |
78 |
+ |
79 |
+ gengeom: $(OBJ) |
80 |
+- $(FC) $(FFLAGS) -o gengeom $(OBJ) |
81 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o gengeom $(OBJ) |
82 |
+ |
83 |
+ calplane: $(OBJ2) |
84 |
+- $(FC) $(FFLAGS) -o calplane $(OBJ2) |
85 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o calplane $(OBJ2) |
86 |
+ |
87 |
+ atomlab: $(OBJ3) |
88 |
+- $(FC) $(FFLAGS) -o atomlab $(OBJ3) |
89 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o atomlab $(OBJ3) |
90 |
+ |
91 |
+ recvec: recvec.o auxil.o |
92 |
+- $(FC) $(FFLAGS) -o recvec recvec.o auxil.o |
93 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o recvec recvec.o auxil.o |
94 |
+ |
95 |
+ str2xcr: $(OBJ5) |
96 |
+- $(FC) $(FFLAGS) -o str2xcr $(OBJ5) |
97 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o str2xcr $(OBJ5) |
98 |
+ |
99 |
+ fracCoor: fracCoor.o auxil.o readf1.o |
100 |
+- $(FC) $(FFLAGS) -o fracCoor fracCoor.o auxil.o readf1.o |
101 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fracCoor fracCoor.o auxil.o readf1.o |
102 |
+ |
103 |
+ multislab: $(OBJ6) |
104 |
+- $(FC) $(FFLAGS) -o multislab $(OBJ6) |
105 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o multislab $(OBJ6) |
106 |
+ |
107 |
+ savestruct: $(OBJ7) |
108 |
+- $(FC) $(FFLAGS) -o savestruct $(OBJ7) |
109 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o savestruct $(OBJ7) |
110 |
+ |
111 |
+ ftnunit: ftnunit.o |
112 |
+- $(FC) $(FFLAGS) -o ftnunit ftnunit.o |
113 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o ftnunit ftnunit.o |
114 |
+ |
115 |
+ kPath: $(OBJ8) |
116 |
+- $(FC) $(FFLAGS) -o kPath $(OBJ8) |
117 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o kPath $(OBJ8) |
118 |
+ |
119 |
+ pwKPath: $(OBJ88) |
120 |
+- $(FC) $(FFLAGS) -o pwKPath $(OBJ88) |
121 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwKPath $(OBJ88) |
122 |
+ |
123 |
+ fhi_inpini2ftn34: fhi_inpini2ftn34.o |
124 |
+- $(FC) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o |
125 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o |
126 |
+ |
127 |
+ fhi_coord2xcr: fhi_coord2xcr.o |
128 |
+- $(FC) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o |
129 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o |
130 |
+ |
131 |
+ wn_readbands: $(OBJ9) |
132 |
+- $(FC) $(FFLAGS) -o wn_readbands $(OBJ9) $(OBJ10) |
133 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbands $(OBJ9) $(OBJ10) |
134 |
+ |
135 |
+ wn_readbakgen: wn_readbakgen.o |
136 |
+- $(FC) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o |
137 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o |
138 |
+ |
139 |
+ pw: pwi2xsf pwi2xsf_old pwo_xsf2xsf |
140 |
+ |
141 |
+ |
142 |
+ pwi2xsf_old: $(OBJ11) |
143 |
+- $(FC) $(FFLAGS) -o pwi2xsf_old $(OBJ11) |
144 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf_old $(OBJ11) |
145 |
+ |
146 |
+ pwi2xsf: $(OBJ111) |
147 |
+- $(FC) $(FFLAGS) -o pwi2xsf $(OBJ111) |
148 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf $(OBJ111) |
149 |
+ |
150 |
+ pwo_xsf2xsf: $(OBJ13) |
151 |
+- $(FC) $(FFLAGS) -o pwo_xsf2xsf $(OBJ13) |
152 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwo_xsf2xsf $(OBJ13) |
153 |
+ |
154 |
+ fsReadBXSF: $(OBJ12) |
155 |
+- $(FC) $(FFLAGS) -o fsReadBXSF $(OBJ12) |
156 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fsReadBXSF $(OBJ12) |
157 |
+ |
158 |
+ cube2xsf: cube2xsf.o |
159 |
+- $(FC) $(FFLAGS) -o cube2xsf cube2xsf.o |
160 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o cube2xsf cube2xsf.o |
161 |
+ |
162 |
+ xsf2cube: xsf2cube.o |
163 |
+- $(FC) $(FFLAGS) -o xsf2cube xsf2cube.o |
164 |
++ $(FC) $(LDFLAGS) $(FFLAGS) -o xsf2cube xsf2cube.o |
165 |
+ |
166 |
+ PROGRAMS = \ |
167 |
+ gengeom calplane atomlab recvec str2xcr fracCoor \ |
168 |
+diff --git a/F/SRC_nn/Makefile b/F/SRC_nn/Makefile |
169 |
+index 2e44de1..06ae768 100644 |
170 |
+--- a/F/SRC_nn/Makefile |
171 |
++++ b/F/SRC_nn/Makefile |
172 |
+@@ -7,7 +7,7 @@ OBJ = nn.o \ |
173 |
+ all: nn install |
174 |
+ |
175 |
+ nn: $(OBJ) |
176 |
+- $(FC) $(FFLAGS) $(OBJ) -o nn |
177 |
++ $(FC) $(LDFLAGS) $(FFLAGS) $(OBJ) -o nn |
178 |
+ |
179 |
+ install: |
180 |
+ if test -f nn.exe ; then cp nn.exe ../../bin ; \ |
181 |
+diff --git a/Makefile b/Makefile |
182 |
+index cfdc14a..f40c8c1 100644 |
183 |
+--- a/Makefile |
184 |
++++ b/Makefile |
185 |
+@@ -4,6 +4,8 @@ |
186 |
+ # |
187 |
+ #------------------------------------------------------------------------ |
188 |
+ |
189 |
++export LDFLAGS |
190 |
++ |
191 |
+ SHELL = /bin/sh |
192 |
+ TOPDIR = $(CURDIR) |
193 |
+ TCL_INDEX = $(TOPDIR)/util/tcl_index |
194 |
|
195 |
diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild |
196 |
index b76f8a0a1..8d43bcf43 100644 |
197 |
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild |
198 |
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild |
199 |
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}" |
200 |
|
201 |
PATCHES=( |
202 |
"${FILESDIR}/${P}-ext-bwidget.patch" |
203 |
+ "${FILESDIR}/${P}-LDFLAGS.patch" |
204 |
"${FILESDIR}/${P}-Togl-lib.patch" |
205 |
"${FILESDIR}/${P}-wrapper-paths.patch" |
206 |
) |