1 |
commit: f83f93985041a9cd241f2f8d3937d4c1e6fe731d |
2 |
Author: Grégory Salvan <apieum <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 21 20:54:51 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 08:36:31 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f83f9398 |
7 |
|
8 |
Remove -DTOGL_X11 and merge with build patch |
9 |
|
10 |
...uild.patch => netgen-5.x-makefiles-fixes.patch} | 148 +++++++++++++-------- |
11 |
sci-mathematics/netgen/netgen-5.3.1.ebuild | 4 +- |
12 |
2 files changed, 96 insertions(+), 56 deletions(-) |
13 |
|
14 |
diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch b/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch |
15 |
similarity index 69% |
16 |
rename from sci-mathematics/netgen/files/netgen-5.3.1_build.patch |
17 |
rename to sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch |
18 |
index 82c6ac9..b6c8fd4 100644 |
19 |
--- a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch |
20 |
+++ b/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch |
21 |
@@ -1,7 +1,15 @@ |
22 |
-diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac |
23 |
---- netgen-5.3.1/configure.ac 2014-10-07 21:38:21.990021106 +0200 |
24 |
-+++ netgen-5.3.1-new/configure.ac 2014-10-07 21:39:14.530034275 +0200 |
25 |
-@@ -35,15 +35,15 @@ AC_ARG_WITH([occ], |
26 |
+diff -uwrN -x.git netgen-5.3.1/configure.ac netgen/configure.ac |
27 |
+--- netgen-5.3.1/configure.ac 2016-02-21 21:40:41.852331652 +0100 |
28 |
++++ netgen/configure.ac 2016-02-21 21:39:31.355329711 +0100 |
29 |
+@@ -14,7 +14,6 @@ |
30 |
+ AC_DISABLE_STATIC |
31 |
+ |
32 |
+ AC_LANG([C++]) |
33 |
+-AM_PROG_AR |
34 |
+ AC_PROG_CXX |
35 |
+ |
36 |
+ AC_OPENMP |
37 |
+@@ -36,15 +35,15 @@ |
38 |
[AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in directory dir])], |
39 |
[occdir=$withval] |
40 |
[occon=true], |
41 |
@@ -20,7 +28,7 @@ diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac |
42 |
|
43 |
# -lTKDCAF |
44 |
|
45 |
-@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui], |
46 |
+@@ -90,18 +89,18 @@ |
47 |
[AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])], |
48 |
[if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi]) |
49 |
|
50 |
@@ -43,10 +51,10 @@ diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac |
51 |
) |
52 |
# -DVTRACE |
53 |
# -lvt-hyb |
54 |
-diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makefile.am |
55 |
---- netgen-5.3.1/libsrc/csg/Makefile.am 2014-10-07 21:38:21.787017193 +0200 |
56 |
-+++ netgen-5.3.1-new/libsrc/csg/Makefile.am 2014-10-07 21:39:14.530034275 +0200 |
57 |
-@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp |
58 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/csg/Makefile.am netgen/libsrc/csg/Makefile.am |
59 |
+--- netgen-5.3.1/libsrc/csg/Makefile.am 2016-02-21 21:40:41.852331652 +0100 |
60 |
++++ netgen/libsrc/csg/Makefile.am 2016-02-21 21:39:31.355329711 +0100 |
61 |
+@@ -8,24 +8,24 @@ |
62 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) |
63 |
METASOURCES = AUTO |
64 |
|
65 |
@@ -77,10 +85,10 @@ diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makef |
66 |
endif |
67 |
|
68 |
# $(top_builddir)/libsrc/geom2d/libgeom2d.la |
69 |
-diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/general/Makefile.am |
70 |
---- netgen-5.3.1/libsrc/general/Makefile.am 2014-10-07 21:38:21.638014320 +0200 |
71 |
-+++ netgen-5.3.1-new/libsrc/general/Makefile.am 2014-10-07 21:39:14.531034296 +0200 |
72 |
-@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp |
73 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/general/Makefile.am netgen/libsrc/general/Makefile.am |
74 |
+--- netgen-5.3.1/libsrc/general/Makefile.am 2016-02-21 21:40:41.852331652 +0100 |
75 |
++++ netgen/libsrc/general/Makefile.am 2016-02-21 21:39:31.356329711 +0100 |
76 |
+@@ -4,8 +4,8 @@ |
77 |
|
78 |
AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include |
79 |
METASOURCES = AUTO |
80 |
@@ -91,10 +99,10 @@ diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/gener |
81 |
hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ |
82 |
profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \ |
83 |
mpi_interface.cpp gzstream.cpp |
84 |
-diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am netgen-5.3.1-new/libsrc/geom2d/Makefile.am |
85 |
---- netgen-5.3.1/libsrc/geom2d/Makefile.am 2014-10-07 21:38:21.832018060 +0200 |
86 |
-+++ netgen-5.3.1-new/libsrc/geom2d/Makefile.am 2014-10-07 21:39:14.531034296 +0200 |
87 |
-@@ -4,18 +4,18 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc |
88 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/geom2d/Makefile.am netgen/libsrc/geom2d/Makefile.am |
89 |
+--- netgen-5.3.1/libsrc/geom2d/Makefile.am 2016-02-21 21:40:41.852331652 +0100 |
90 |
++++ netgen/libsrc/geom2d/Makefile.am 2016-02-21 21:39:31.356329711 +0100 |
91 |
+@@ -4,18 +4,18 @@ |
92 |
|
93 |
METASOURCES = AUTO |
94 |
|
95 |
@@ -119,10 +127,10 @@ diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am netgen-5.3.1-new/libsrc/geom2d |
96 |
+libnggeom2dvis_la_LIBADD = libnggeom2d.la -lGL $(MPI_LIBS) |
97 |
|
98 |
|
99 |
-diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am netgen-5.3.1-new/libsrc/gprim/Makefile.am |
100 |
---- netgen-5.3.1/libsrc/gprim/Makefile.am 2014-10-07 21:38:21.719015882 +0200 |
101 |
-+++ netgen-5.3.1-new/libsrc/gprim/Makefile.am 2014-10-07 21:39:14.531034296 +0200 |
102 |
-@@ -2,6 +2,6 @@ noinst_HEADERS = adtree.hpp geom3d.hpp |
103 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/gprim/Makefile.am netgen/libsrc/gprim/Makefile.am |
104 |
+--- netgen-5.3.1/libsrc/gprim/Makefile.am 2016-02-21 21:40:41.853331652 +0100 |
105 |
++++ netgen/libsrc/gprim/Makefile.am 2016-02-21 21:39:31.357329711 +0100 |
106 |
+@@ -2,6 +2,6 @@ |
107 |
|
108 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include |
109 |
METASOURCES = AUTO |
110 |
@@ -131,10 +139,10 @@ diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am netgen-5.3.1-new/libsrc/gprim/M |
111 |
+noinst_LTLIBRARIES = libnggprim.la |
112 |
+libnggprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ |
113 |
geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp |
114 |
-diff -rupN netgen-5.3.1/libsrc/interface/Makefile.am netgen-5.3.1-new/libsrc/interface/Makefile.am |
115 |
---- netgen-5.3.1/libsrc/interface/Makefile.am 2014-10-07 21:38:21.846018330 +0200 |
116 |
-+++ netgen-5.3.1-new/libsrc/interface/Makefile.am 2014-10-07 21:44:17.523887314 +0200 |
117 |
-@@ -2,14 +2,14 @@ noinst_HEADERS = writeuser.hpp |
118 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/interface/Makefile.am netgen/libsrc/interface/Makefile.am |
119 |
+--- netgen-5.3.1/libsrc/interface/Makefile.am 2016-02-21 21:40:41.853331652 +0100 |
120 |
++++ netgen/libsrc/interface/Makefile.am 2016-02-21 21:39:31.357329711 +0100 |
121 |
+@@ -2,14 +2,14 @@ |
122 |
|
123 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(MPI_INCLUDES) $(TCL_INCLUDES) -DOPENGL |
124 |
METASOURCES = AUTO |
125 |
@@ -152,9 +160,9 @@ diff -rupN netgen-5.3.1/libsrc/interface/Makefile.am netgen-5.3.1-new/libsrc/int |
126 |
+libnginterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la |
127 |
|
128 |
# libinterface_la_LDFLAGS = -rdynamic |
129 |
-diff -rupN netgen-5.3.1/libsrc/linalg/Makefile.am netgen-5.3.1-new/libsrc/linalg/Makefile.am |
130 |
---- netgen-5.3.1/libsrc/linalg/Makefile.am 2014-10-07 21:38:21.667014879 +0200 |
131 |
-+++ netgen-5.3.1-new/libsrc/linalg/Makefile.am 2014-10-07 21:39:14.532034315 +0200 |
132 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/linalg/Makefile.am netgen/libsrc/linalg/Makefile.am |
133 |
+--- netgen-5.3.1/libsrc/linalg/Makefile.am 2016-02-21 21:40:41.853331652 +0100 |
134 |
++++ netgen/libsrc/linalg/Makefile.am 2016-02-21 21:39:31.357329711 +0100 |
135 |
@@ -1,8 +1,8 @@ |
136 |
noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp opti.hpp |
137 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include |
138 |
@@ -166,10 +174,10 @@ diff -rupN netgen-5.3.1/libsrc/linalg/Makefile.am netgen-5.3.1-new/libsrc/linalg |
139 |
|
140 |
# vector.cpp |
141 |
|
142 |
-diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshing/Makefile.am |
143 |
---- netgen-5.3.1/libsrc/meshing/Makefile.am 2014-10-07 21:38:21.895019275 +0200 |
144 |
-+++ netgen-5.3.1-new/libsrc/meshing/Makefile.am 2014-10-07 21:39:14.532034315 +0200 |
145 |
-@@ -15,9 +15,9 @@ clusters.hpp hprefinement.hpp improve3.h |
146 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/Makefile.am netgen/libsrc/meshing/Makefile.am |
147 |
+--- netgen-5.3.1/libsrc/meshing/Makefile.am 2016-02-21 21:40:41.853331652 +0100 |
148 |
++++ netgen/libsrc/meshing/Makefile.am 2016-02-21 21:39:31.358329711 +0100 |
149 |
+@@ -15,9 +15,9 @@ |
150 |
|
151 |
METASOURCES = AUTO |
152 |
|
153 |
@@ -181,7 +189,7 @@ diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshi |
154 |
clusters.cpp curvedelems.cpp delaunay.cpp delaunay2d.cpp \ |
155 |
geomsearch.cpp global.cpp hprefinement.cpp improve2.cpp \ |
156 |
improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp \ |
157 |
-@@ -30,8 +30,8 @@ libmesh_la_SOURCES = adfront2.cpp adfron |
158 |
+@@ -30,8 +30,8 @@ |
159 |
topology.cpp triarls.cpp validate.cpp zrefine.cpp bcfunctions.cpp \ |
160 |
parallelmesh.cpp paralleltop.cpp paralleltop.hpp basegeom.cpp |
161 |
|
162 |
@@ -194,10 +202,10 @@ diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshi |
163 |
+ $(top_builddir)/libsrc/general/libnggen.la \ |
164 |
+ $(MPI_LIBS) -lz |
165 |
|
166 |
-diff -rupN netgen-5.3.1/libsrc/occ/Makefile.am netgen-5.3.1-new/libsrc/occ/Makefile.am |
167 |
---- netgen-5.3.1/libsrc/occ/Makefile.am 2014-10-07 21:38:21.739016267 +0200 |
168 |
-+++ netgen-5.3.1-new/libsrc/occ/Makefile.am 2014-10-07 21:39:14.533034334 +0200 |
169 |
-@@ -14,20 +14,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc |
170 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/occ/Makefile.am netgen/libsrc/occ/Makefile.am |
171 |
+--- netgen-5.3.1/libsrc/occ/Makefile.am 2016-02-21 21:40:41.853331652 +0100 |
172 |
++++ netgen/libsrc/occ/Makefile.am 2016-02-21 21:39:31.358329711 +0100 |
173 |
+@@ -14,20 +14,20 @@ |
174 |
|
175 |
METASOURCES = AUTO |
176 |
|
177 |
@@ -224,10 +232,10 @@ diff -rupN netgen-5.3.1/libsrc/occ/Makefile.am netgen-5.3.1-new/libsrc/occ/Makef |
178 |
+libngoccvis_la_LIBADD = libngocc.la $(TCL_LIB_SPEC) |
179 |
|
180 |
|
181 |
-diff -rupN netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen-5.3.1-new/libsrc/stlgeom/Makefile.am |
182 |
---- netgen-5.3.1/libsrc/stlgeom/Makefile.am 2014-10-07 21:38:21.683015188 +0200 |
183 |
-+++ netgen-5.3.1-new/libsrc/stlgeom/Makefile.am 2014-10-07 21:39:14.533034334 +0200 |
184 |
-@@ -4,18 +4,18 @@ stltool.hpp stltopology.hpp vsstl.hpp |
185 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen/libsrc/stlgeom/Makefile.am |
186 |
+--- netgen-5.3.1/libsrc/stlgeom/Makefile.am 2016-02-21 21:40:41.854331653 +0100 |
187 |
++++ netgen/libsrc/stlgeom/Makefile.am 2016-02-21 21:39:31.359329711 +0100 |
188 |
+@@ -4,18 +4,18 @@ |
189 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) |
190 |
METASOURCES = AUTO |
191 |
|
192 |
@@ -252,10 +260,10 @@ diff -rupN netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen-5.3.1-new/libsrc/stlge |
193 |
+libngstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS) |
194 |
# libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la |
195 |
|
196 |
-diff -rupN netgen-5.3.1/libsrc/visualization/Makefile.am netgen-5.3.1-new/libsrc/visualization/Makefile.am |
197 |
---- netgen-5.3.1/libsrc/visualization/Makefile.am 2014-10-07 21:38:21.822017867 +0200 |
198 |
-+++ netgen-5.3.1-new/libsrc/visualization/Makefile.am 2014-10-07 21:39:14.533034334 +0200 |
199 |
-@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_s |
200 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/visualization/Makefile.am netgen/libsrc/visualization/Makefile.am |
201 |
+--- netgen-5.3.1/libsrc/visualization/Makefile.am 2016-02-21 21:40:41.854331653 +0100 |
202 |
++++ netgen/libsrc/visualization/Makefile.am 2016-02-21 21:39:31.359329711 +0100 |
203 |
+@@ -7,11 +7,11 @@ |
204 |
METASOURCES = AUTO |
205 |
|
206 |
if NGGUI |
207 |
@@ -270,10 +278,30 @@ diff -rupN netgen-5.3.1/libsrc/visualization/Makefile.am netgen-5.3.1-new/libsrc |
208 |
|
209 |
- |
210 |
+libngvisual_la_LIBADD = -lGL |
211 |
-diff -rupN netgen-5.3.1/ng/Makefile.am netgen-5.3.1-new/ng/Makefile.am |
212 |
---- netgen-5.3.1/ng/Makefile.am 2014-10-07 21:38:21.973020778 +0200 |
213 |
-+++ netgen-5.3.1-new/ng/Makefile.am 2014-10-07 21:39:14.534034353 +0200 |
214 |
-@@ -17,21 +17,18 @@ MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lm |
215 |
+diff -uwrN -x.git netgen-5.3.1/libsrc/visualization/Makefile.in netgen/libsrc/visualization/Makefile.in |
216 |
+--- netgen-5.3.1/libsrc/visualization/Makefile.in 2016-02-21 21:40:41.855331653 +0100 |
217 |
++++ netgen/libsrc/visualization/Makefile.in 2016-02-21 21:39:31.360329711 +0100 |
218 |
+@@ -275,7 +275,7 @@ |
219 |
+ visual.hpp vssolution.hpp |
220 |
+ |
221 |
+ include_HEADERS = soldata.hpp |
222 |
+-AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) |
223 |
++AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) |
224 |
+ METASOURCES = AUTO |
225 |
+ @NGGUI_TRUE@noinst_LTLIBRARIES = libvisual.la |
226 |
+ libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ |
227 |
+diff -uwrN -x.git netgen-5.3.1/ng/Makefile.am netgen/ng/Makefile.am |
228 |
+--- netgen-5.3.1/ng/Makefile.am 2016-02-21 21:40:41.855331653 +0100 |
229 |
++++ netgen/ng/Makefile.am 2016-02-21 21:39:31.360329711 +0100 |
230 |
+@@ -1,6 +1,6 @@ |
231 |
+ include_HEADERS = |
232 |
+ |
233 |
+-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) |
234 |
++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) |
235 |
+ |
236 |
+ |
237 |
+ if NGGUI |
238 |
+@@ -17,21 +17,18 @@ |
239 |
endif |
240 |
# -lpardiso500-GNU472-X86-64 -lgfortran |
241 |
|
242 |
@@ -307,10 +335,22 @@ diff -rupN netgen-5.3.1/ng/Makefile.am netgen-5.3.1-new/ng/Makefile.am |
243 |
|
244 |
|
245 |
# add for static linkage of ngsolve: |
246 |
-diff -rupN netgen-5.3.1/nglib/Makefile.am netgen-5.3.1-new/nglib/Makefile.am |
247 |
---- netgen-5.3.1/nglib/Makefile.am 2014-10-07 21:38:21.552012662 +0200 |
248 |
-+++ netgen-5.3.1-new/nglib/Makefile.am 2014-10-07 21:39:27.915292493 +0200 |
249 |
-@@ -8,15 +8,15 @@ lib_LTLIBRARIES = libnglib.la |
250 |
+diff -uwrN -x.git netgen-5.3.1/ng/Makefile.in netgen/ng/Makefile.in |
251 |
+--- netgen-5.3.1/ng/Makefile.in 2016-02-21 21:40:41.856331653 +0100 |
252 |
++++ netgen/ng/Makefile.in 2016-02-21 21:39:31.361329711 +0100 |
253 |
+@@ -302,7 +302,7 @@ |
254 |
+ include_HEADERS = |
255 |
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include \ |
256 |
+ -I$(top_srcdir)/libsrc/interface -DOPENGL \ |
257 |
+- -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) \ |
258 |
++ $(TCL_INCLUDES) $(MPI_INCLUDES) \ |
259 |
+ $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(am__append_1) |
260 |
+ netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h |
261 |
+ @NGMKL_TRUE@MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def |
262 |
+diff -uwrN -x.git netgen-5.3.1/nglib/Makefile.am netgen/nglib/Makefile.am |
263 |
+--- netgen-5.3.1/nglib/Makefile.am 2016-02-21 21:40:41.856331653 +0100 |
264 |
++++ netgen/nglib/Makefile.am 2016-02-21 21:39:31.362329711 +0100 |
265 |
+@@ -8,15 +8,15 @@ |
266 |
libnglib_la_SOURCES = nglib.cpp |
267 |
|
268 |
libnglib_la_LIBADD = \ |
269 |
@@ -333,7 +373,7 @@ diff -rupN netgen-5.3.1/nglib/Makefile.am netgen-5.3.1-new/nglib/Makefile.am |
270 |
# -rdynamic |
271 |
|
272 |
|
273 |
-@@ -25,24 +25,24 @@ bin_PROGRAMS = ng_vol ng_stl |
274 |
+@@ -25,24 +25,24 @@ |
275 |
|
276 |
ng_vol_SOURCES = ng_vol.cpp |
277 |
ng_vol_LDADD = libnglib.la \ |
278 |
|
279 |
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
280 |
index d3cf9f9..b23cd8a 100644 |
281 |
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild |
282 |
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
283 |
@@ -39,8 +39,8 @@ src_prepare() { |
284 |
# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch |
285 |
epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch" |
286 |
epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch" |
287 |
- # Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch |
288 |
- epatch "${FILESDIR}/${PN}-5.3.1_build.patch" |
289 |
+ # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch |
290 |
+ epatch "${FILESDIR}/${PN}-5.x-makefiles-fixes.patch" |
291 |
# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch |
292 |
epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch" |
293 |
epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch" |