1 |
commit: 7882cf4cfd2995f94b03c608ceb7090b97258cf2 |
2 |
Author: Grégory Salvan <apieum <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 20 22:42:39 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=7882cf4c |
7 |
|
8 |
Added build patch from fedora (fix Mesh :: ParallelMetis linking error...) |
9 |
|
10 |
.../netgen/files/netgen-5.3.1_build.patch | 372 +++++++++++++++++++++ |
11 |
sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 + |
12 |
2 files changed, 374 insertions(+) |
13 |
|
14 |
diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch |
15 |
new file mode 100644 |
16 |
index 0000000..dd8d395 |
17 |
--- /dev/null |
18 |
+++ b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch |
19 |
@@ -0,0 +1,372 @@ |
20 |
+diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac |
21 |
+--- netgen-5.3.1/configure.ac 2014-10-07 21:38:21.990021106 +0200 |
22 |
++++ netgen-5.3.1-new/configure.ac 2014-10-07 21:39:14.530034275 +0200 |
23 |
+@@ -35,15 +35,15 @@ AC_ARG_WITH([occ], |
24 |
+ [AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in directory dir])], |
25 |
+ [occdir=$withval] |
26 |
+ [occon=true], |
27 |
+- [occdir=/opt/OpenCASCADE] |
28 |
++ [occdir=/usr] |
29 |
+ ) |
30 |
+ |
31 |
+ |
32 |
+ |
33 |
+ if test a$occon = atrue ; then |
34 |
+ |
35 |
+- AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"]) |
36 |
+- AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) |
37 |
++ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I/usr/include/oce"]) |
38 |
++ AC_SUBST([OCCLIBS], ["-lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) |
39 |
+ |
40 |
+ # -lTKDCAF |
41 |
+ |
42 |
+@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui], |
43 |
+ [AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])], |
44 |
+ [if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi]) |
45 |
+ |
46 |
+-metisdir=/usr/local |
47 |
++metisdir=/usr |
48 |
+ AC_ARG_WITH([metis], |
49 |
+ [AC_HELP_STRING([--with-metis=dir],[path to metis 5.x])], |
50 |
+ [metisdir=$withval], |
51 |
+- [metisdir=/usr/local] |
52 |
++ [metisdir=/usr] |
53 |
+ ) |
54 |
+ |
55 |
+ AC_ARG_ENABLE([parallel], |
56 |
+ [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], |
57 |
+- [AC_SUBST([MPI_INCLUDES], "-I$metisdir/include -DMETIS")] |
58 |
++ [AC_SUBST([MPI_INCLUDES], "-DMETIS")] |
59 |
+ [CXXFLAGS="$CXXFLAGS -DPARALLEL"] |
60 |
+- [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")] |
61 |
++ [AC_SUBST([MPI_LIBS], "-lmetis")] |
62 |
+ ) |
63 |
+ # -DVTRACE |
64 |
+ # -lvt-hyb |
65 |
+diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makefile.am |
66 |
+--- netgen-5.3.1/libsrc/csg/Makefile.am 2014-10-07 21:38:21.787017193 +0200 |
67 |
++++ netgen-5.3.1-new/libsrc/csg/Makefile.am 2014-10-07 21:39:14.530034275 +0200 |
68 |
+@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp |
69 |
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) |
70 |
+ METASOURCES = AUTO |
71 |
+ |
72 |
+-lib_LTLIBRARIES = libcsg.la |
73 |
++lib_LTLIBRARIES = libngcsg.la |
74 |
+ |
75 |
+ |
76 |
+-libcsg_la_SOURCES = algprim.cpp brick.cpp \ |
77 |
++libngcsg_la_SOURCES = algprim.cpp brick.cpp \ |
78 |
+ bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp \ |
79 |
+ explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp \ |
80 |
+ manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \ |
81 |
+ solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp |
82 |
+ |
83 |
+-libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la |
84 |
++libngcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la |
85 |
+ |
86 |
+ |
87 |
+ |
88 |
+ if NGGUI |
89 |
+-lib_LTLIBRARIES += libcsgvis.la |
90 |
++lib_LTLIBRARIES += libngcsgvis.la |
91 |
+ |
92 |
+-libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp |
93 |
+-libcsgvis_la_LIBADD = libcsg.la |
94 |
++libngcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp |
95 |
++libngcsgvis_la_LIBADD = libngcsg.la |
96 |
+ endif |
97 |
+ |
98 |
+ # $(top_builddir)/libsrc/geom2d/libgeom2d.la |
99 |
+diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/general/Makefile.am |
100 |
+--- netgen-5.3.1/libsrc/general/Makefile.am 2014-10-07 21:38:21.638014320 +0200 |
101 |
++++ netgen-5.3.1-new/libsrc/general/Makefile.am 2014-10-07 21:39:14.531034296 +0200 |
102 |
+@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp |
103 |
+ |
104 |
+ AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include |
105 |
+ METASOURCES = AUTO |
106 |
+-noinst_LTLIBRARIES = libgen.la |
107 |
+-libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ |
108 |
++noinst_LTLIBRARIES = libnggen.la |
109 |
++libnggen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ |
110 |
+ hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ |
111 |
+ profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \ |
112 |
+ mpi_interface.cpp gzstream.cpp |
113 |
+diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am netgen-5.3.1-new/libsrc/geom2d/Makefile.am |
114 |
+--- netgen-5.3.1/libsrc/geom2d/Makefile.am 2014-10-07 21:38:21.832018060 +0200 |
115 |
++++ netgen-5.3.1-new/libsrc/geom2d/Makefile.am 2014-10-07 21:39:14.531034296 +0200 |
116 |
+@@ -4,18 +4,18 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc |
117 |
+ |
118 |
+ METASOURCES = AUTO |
119 |
+ |
120 |
+-lib_LTLIBRARIES = libgeom2d.la |
121 |
++lib_LTLIBRARIES = libnggeom2d.la |
122 |
+ |
123 |
+ if NGGUI |
124 |
+-lib_LTLIBRARIES += libgeom2dvis.la |
125 |
++lib_LTLIBRARIES += libnggeom2dvis.la |
126 |
+ endif |
127 |
+ |
128 |
+ |
129 |
+ |
130 |
+-libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp |
131 |
+-libgeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la |
132 |
++libnggeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp |
133 |
++libnggeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS) |
134 |
+ |
135 |
+-libgeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp |
136 |
+-libgeom2dvis_la_LIBADD = libgeom2d.la |
137 |
++libnggeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp |
138 |
++libnggeom2dvis_la_LIBADD = libnggeom2d.la -lGL $(MPI_LIBS) |
139 |
+ |
140 |
+ |
141 |
+diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am netgen-5.3.1-new/libsrc/gprim/Makefile.am |
142 |
+--- netgen-5.3.1/libsrc/gprim/Makefile.am 2014-10-07 21:38:21.719015882 +0200 |
143 |
++++ netgen-5.3.1-new/libsrc/gprim/Makefile.am 2014-10-07 21:39:14.531034296 +0200 |
144 |
+@@ -2,6 +2,6 @@ noinst_HEADERS = adtree.hpp geom3d.hpp |
145 |
+ |
146 |
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include |
147 |
+ METASOURCES = AUTO |
148 |
+-noinst_LTLIBRARIES = libgprim.la |
149 |
+-libgprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ |
150 |
++noinst_LTLIBRARIES = libnggprim.la |
151 |
++libnggprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ |
152 |
+ geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp |
153 |
+diff -rupN netgen-5.3.1/libsrc/interface/Makefile.am netgen-5.3.1-new/libsrc/interface/Makefile.am |
154 |
+--- netgen-5.3.1/libsrc/interface/Makefile.am 2014-10-07 21:38:21.846018330 +0200 |
155 |
++++ netgen-5.3.1-new/libsrc/interface/Makefile.am 2014-10-07 21:44:17.523887314 +0200 |
156 |
+@@ -2,14 +2,14 @@ noinst_HEADERS = writeuser.hpp |
157 |
+ |
158 |
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(MPI_INCLUDES) $(TCL_INCLUDES) -DOPENGL |
159 |
+ METASOURCES = AUTO |
160 |
+-lib_LTLIBRARIES = libinterface.la |
161 |
+-libinterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \ |
162 |
++lib_LTLIBRARIES = libnginterface.la |
163 |
++libnginterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \ |
164 |
+ read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \ |
165 |
+ writedolfin.cpp writeelmer.cpp writefeap.cpp writefluent.cpp writegmsh.cpp writejcm.cpp \ |
166 |
+ writepermas.cpp writetecplot.cpp writetet.cpp writetochnog.cpp writeuser.cpp \ |
167 |
+ wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp |
168 |
+ |
169 |
+ |
170 |
+-libinterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la |
171 |
++libnginterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la |
172 |
+ |
173 |
+ # libinterface_la_LDFLAGS = -rdynamic |
174 |
+diff -rupN netgen-5.3.1/libsrc/linalg/Makefile.am netgen-5.3.1-new/libsrc/linalg/Makefile.am |
175 |
+--- netgen-5.3.1/libsrc/linalg/Makefile.am 2014-10-07 21:38:21.667014879 +0200 |
176 |
++++ netgen-5.3.1-new/libsrc/linalg/Makefile.am 2014-10-07 21:39:14.532034315 +0200 |
177 |
+@@ -1,8 +1,8 @@ |
178 |
+ noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp opti.hpp |
179 |
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include |
180 |
+ METASOURCES = AUTO |
181 |
+-noinst_LTLIBRARIES = libla.la |
182 |
+-libla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp |
183 |
++noinst_LTLIBRARIES = libngla.la |
184 |
++libngla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp |
185 |
+ |
186 |
+ # vector.cpp |
187 |
+ |
188 |
+diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshing/Makefile.am |
189 |
+--- netgen-5.3.1/libsrc/meshing/Makefile.am 2014-10-07 21:38:21.895019275 +0200 |
190 |
++++ netgen-5.3.1-new/libsrc/meshing/Makefile.am 2014-10-07 21:39:14.532034315 +0200 |
191 |
+@@ -15,9 +15,9 @@ clusters.hpp hprefinement.hpp improve3.h |
192 |
+ |
193 |
+ METASOURCES = AUTO |
194 |
+ |
195 |
+-lib_LTLIBRARIES = libmesh.la |
196 |
++lib_LTLIBRARIES = libngmesh.la |
197 |
+ |
198 |
+-libmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ |
199 |
++libngmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ |
200 |
+ clusters.cpp curvedelems.cpp delaunay.cpp delaunay2d.cpp \ |
201 |
+ geomsearch.cpp global.cpp hprefinement.cpp improve2.cpp \ |
202 |
+ improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp \ |
203 |
+@@ -30,8 +30,8 @@ libmesh_la_SOURCES = adfront2.cpp adfron |
204 |
+ topology.cpp triarls.cpp validate.cpp zrefine.cpp bcfunctions.cpp \ |
205 |
+ parallelmesh.cpp paralleltop.cpp paralleltop.hpp basegeom.cpp |
206 |
+ |
207 |
+-libmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libla.la \ |
208 |
+- $(top_builddir)/libsrc/gprim/libgprim.la \ |
209 |
+- $(top_builddir)/libsrc/general/libgen.la \ |
210 |
+- -lz |
211 |
++libngmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libngla.la \ |
212 |
++ $(top_builddir)/libsrc/gprim/libnggprim.la \ |
213 |
++ $(top_builddir)/libsrc/general/libnggen.la \ |
214 |
++ $(MPI_LIBS) -lz |
215 |
+ |
216 |
+diff -rupN netgen-5.3.1/libsrc/occ/Makefile.am netgen-5.3.1-new/libsrc/occ/Makefile.am |
217 |
+--- netgen-5.3.1/libsrc/occ/Makefile.am 2014-10-07 21:38:21.739016267 +0200 |
218 |
++++ netgen-5.3.1-new/libsrc/occ/Makefile.am 2014-10-07 21:39:14.533034334 +0200 |
219 |
+@@ -14,20 +14,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc |
220 |
+ |
221 |
+ METASOURCES = AUTO |
222 |
+ |
223 |
+-lib_LTLIBRARIES = libocc.la |
224 |
++lib_LTLIBRARIES = libngocc.la |
225 |
+ |
226 |
+ if NGGUI |
227 |
+-lib_LTLIBRARIES += liboccvis.la |
228 |
++lib_LTLIBRARIES += libngoccvis.la |
229 |
+ endif |
230 |
+ |
231 |
+ |
232 |
+-libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ |
233 |
++libngocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ |
234 |
+ Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \ |
235 |
+ occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp |
236 |
+ |
237 |
+-libocc_la_LIBADD = $(OCCLIBS) |
238 |
++libngocc_la_LIBADD = $(OCCLIBS) |
239 |
+ |
240 |
+-liboccvis_la_SOURCES = occpkg.cpp vsocc.cpp |
241 |
+-liboccvis_la_LIBADD = libocc.la |
242 |
++libngoccvis_la_SOURCES = occpkg.cpp vsocc.cpp |
243 |
++libngoccvis_la_LIBADD = libngocc.la $(TCL_LIB_SPEC) |
244 |
+ |
245 |
+ |
246 |
+diff -rupN netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen-5.3.1-new/libsrc/stlgeom/Makefile.am |
247 |
+--- netgen-5.3.1/libsrc/stlgeom/Makefile.am 2014-10-07 21:38:21.683015188 +0200 |
248 |
++++ netgen-5.3.1-new/libsrc/stlgeom/Makefile.am 2014-10-07 21:39:14.533034334 +0200 |
249 |
+@@ -4,18 +4,18 @@ stltool.hpp stltopology.hpp vsstl.hpp |
250 |
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) |
251 |
+ METASOURCES = AUTO |
252 |
+ |
253 |
+-lib_LTLIBRARIES = libstl.la |
254 |
++lib_LTLIBRARIES = libngstl.la |
255 |
+ |
256 |
+ if NGGUI |
257 |
+-lib_LTLIBRARIES += libstlvis.la |
258 |
++lib_LTLIBRARIES += libngstlvis.la |
259 |
+ endif |
260 |
+ |
261 |
+-libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ |
262 |
++libngstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ |
263 |
+ stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp |
264 |
+ |
265 |
+ |
266 |
+-libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp |
267 |
+-libstlvis_la_LIBADD = libstl.la |
268 |
+-libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la |
269 |
++libngstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp |
270 |
++libngstlvis_la_LIBADD = libngstl.la -lGL $(MPI_LIBS) $(TCL_LIB_SPEC) |
271 |
++libngstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS) |
272 |
+ # libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la |
273 |
+ |
274 |
+diff -rupN netgen-5.3.1/libsrc/visualization/Makefile.am netgen-5.3.1-new/libsrc/visualization/Makefile.am |
275 |
+--- netgen-5.3.1/libsrc/visualization/Makefile.am 2014-10-07 21:38:21.822017867 +0200 |
276 |
++++ netgen-5.3.1-new/libsrc/visualization/Makefile.am 2014-10-07 21:39:14.533034334 +0200 |
277 |
+@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_s |
278 |
+ METASOURCES = AUTO |
279 |
+ |
280 |
+ if NGGUI |
281 |
+-noinst_LTLIBRARIES = libvisual.la |
282 |
++noinst_LTLIBRARIES = libngvisual.la |
283 |
+ endif |
284 |
+ |
285 |
+ |
286 |
+-libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ |
287 |
++libngvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ |
288 |
+ vsfieldlines.cpp vsmesh.cpp vssolution.cpp importsolution.cpp |
289 |
+ |
290 |
+- |
291 |
++libngvisual_la_LIBADD = -lGL |
292 |
+diff -rupN netgen-5.3.1/ng/Makefile.am netgen-5.3.1-new/ng/Makefile.am |
293 |
+--- netgen-5.3.1/ng/Makefile.am 2014-10-07 21:38:21.973020778 +0200 |
294 |
++++ netgen-5.3.1-new/ng/Makefile.am 2014-10-07 21:39:14.534034353 +0200 |
295 |
+@@ -17,21 +17,18 @@ MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lm |
296 |
+ endif |
297 |
+ # -lpardiso500-GNU472-X86-64 -lgfortran |
298 |
+ |
299 |
+-netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \ |
300 |
+- $(top_builddir)/libsrc/csg/libcsgvis.la \ |
301 |
+- $(top_builddir)/libsrc/csg/libcsg.la \ |
302 |
+- $(top_builddir)/libsrc/interface/libinterface.la \ |
303 |
+- $(top_builddir)/libsrc/meshing/libmesh.la \ |
304 |
+- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) |
305 |
+- |
306 |
+- |
307 |
+-# |
308 |
+-# $(top_builddir)/libsrc/occ/liboccvis.la |
309 |
+-# $(top_builddir)/libsrc/occ/libocc.la |
310 |
+-# $(top_builddir)/libsrc/stlgeom/libstlvis.la |
311 |
+-# $(top_builddir)/libsrc/stlgeom/libstl.la |
312 |
+-# $(top_builddir)/libsrc/geom2d/libgeom2d.la |
313 |
+-# $(top_builddir)/libsrc/geom2d/libgeom2dvis.la |
314 |
++netgen_LDADD = $(top_builddir)/libsrc/visualization/libngvisual.la \ |
315 |
++ $(top_builddir)/libsrc/csg/libngcsgvis.la \ |
316 |
++ $(top_builddir)/libsrc/csg/libngcsg.la \ |
317 |
++ $(top_builddir)/libsrc/interface/libnginterface.la \ |
318 |
++ $(top_builddir)/libsrc/meshing/libngmesh.la \ |
319 |
++ $(top_builddir)/libsrc/occ/libngoccvis.la \ |
320 |
++ $(top_builddir)/libsrc/occ/libngocc.la \ |
321 |
++ $(top_builddir)/libsrc/stlgeom/libngstlvis.la \ |
322 |
++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ |
323 |
++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ |
324 |
++ $(top_builddir)/libsrc/geom2d/libnggeom2dvis.la \ |
325 |
++ -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 -ldl -lX11 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) |
326 |
+ |
327 |
+ |
328 |
+ # add for static linkage of ngsolve: |
329 |
+diff -rupN netgen-5.3.1/nglib/Makefile.am netgen-5.3.1-new/nglib/Makefile.am |
330 |
+--- netgen-5.3.1/nglib/Makefile.am 2014-10-07 21:38:21.552012662 +0200 |
331 |
++++ netgen-5.3.1-new/nglib/Makefile.am 2014-10-07 21:39:27.915292493 +0200 |
332 |
+@@ -8,15 +8,15 @@ lib_LTLIBRARIES = libnglib.la |
333 |
+ libnglib_la_SOURCES = nglib.cpp |
334 |
+ |
335 |
+ libnglib_la_LIBADD = \ |
336 |
+- $(top_builddir)/libsrc/interface/libinterface.la \ |
337 |
+- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ |
338 |
+- $(top_builddir)/libsrc/csg/libcsg.la \ |
339 |
+- $(top_builddir)/libsrc/stlgeom/libstl.la \ |
340 |
+- $(top_builddir)/libsrc/occ/libocc.la \ |
341 |
+- $(top_builddir)/libsrc/meshing/libmesh.la \ |
342 |
++ $(top_builddir)/libsrc/interface/libnginterface.la \ |
343 |
++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ |
344 |
++ $(top_builddir)/libsrc/csg/libngcsg.la \ |
345 |
++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ |
346 |
++ $(top_builddir)/libsrc/occ/libngocc.la \ |
347 |
++ $(top_builddir)/libsrc/meshing/libngmesh.la \ |
348 |
+ $(OCCLIBS) $(MPI_LIBS) |
349 |
+ |
350 |
+-libnglib_la_LDFLAGS = -avoid-version |
351 |
++libnglib_la_LDFLAGS = -release $(PACKAGE_VERSION) |
352 |
+ # -rdynamic |
353 |
+ |
354 |
+ |
355 |
+@@ -25,24 +25,24 @@ bin_PROGRAMS = ng_vol ng_stl |
356 |
+ |
357 |
+ ng_vol_SOURCES = ng_vol.cpp |
358 |
+ ng_vol_LDADD = libnglib.la \ |
359 |
+- $(top_builddir)/libsrc/interface/libinterface.la \ |
360 |
+- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ |
361 |
+- $(top_builddir)/libsrc/csg/libcsg.la \ |
362 |
+- $(top_builddir)/libsrc/stlgeom/libstl.la \ |
363 |
+- $(top_builddir)/libsrc/occ/libocc.la \ |
364 |
+- $(top_builddir)/libsrc/meshing/libmesh.la \ |
365 |
++ $(top_builddir)/libsrc/interface/libnginterface.la \ |
366 |
++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ |
367 |
++ $(top_builddir)/libsrc/csg/libngcsg.la \ |
368 |
++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ |
369 |
++ $(top_builddir)/libsrc/occ/libngocc.la \ |
370 |
++ $(top_builddir)/libsrc/meshing/libngmesh.la \ |
371 |
+ $(OCCLIBS) $(MPI_LIBS) |
372 |
+ |
373 |
+ |
374 |
+ |
375 |
+ ng_stl_SOURCES = ng_stl.cpp |
376 |
+ ng_stl_LDADD = libnglib.la \ |
377 |
+- $(top_builddir)/libsrc/interface/libinterface.la \ |
378 |
+- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ |
379 |
+- $(top_builddir)/libsrc/csg/libcsg.la \ |
380 |
+- $(top_builddir)/libsrc/stlgeom/libstl.la \ |
381 |
+- $(top_builddir)/libsrc/occ/libocc.la \ |
382 |
+- $(top_builddir)/libsrc/meshing/libmesh.la \ |
383 |
++ $(top_builddir)/libsrc/interface/libnginterface.la \ |
384 |
++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ |
385 |
++ $(top_builddir)/libsrc/csg/libngcsg.la \ |
386 |
++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ |
387 |
++ $(top_builddir)/libsrc/occ/libngocc.la \ |
388 |
++ $(top_builddir)/libsrc/meshing/libngmesh.la \ |
389 |
+ $(OCCLIBS) $(MPI_LIBS) |
390 |
+ |
391 |
+ # ng_occ_SOURCES = ng_occ.cpp |
392 |
|
393 |
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
394 |
index 0c2da7d..5cdb4ab 100644 |
395 |
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild |
396 |
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
397 |
@@ -38,6 +38,8 @@ src_prepare() { |
398 |
# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch |
399 |
epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch" |
400 |
epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch" |
401 |
+ # Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch |
402 |
+ epatch "${FILESDIR}/${PN}-5.3.1_build.patch" |
403 |
if use mpi; then |
404 |
export CC=mpicc |
405 |
export CXX=mpic++ |