From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C01831388C0 for ; Mon, 22 Feb 2016 08:38:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 496B521C00E; Mon, 22 Feb 2016 08:38:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4B1F21C00B for ; Mon, 22 Feb 2016 08:38:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B9AF340B3F for ; Mon, 22 Feb 2016 08:38:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 188881B9F for ; Mon, 22 Feb 2016 08:38:08 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1456130191.7882cf4cfd2995f94b03c608ceb7090b97258cf2.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/netgen/files/netgen-5.3.1_build.patch sci-mathematics/netgen/netgen-5.3.1.ebuild X-VCS-Directories: sci-mathematics/netgen/ sci-mathematics/netgen/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 7882cf4cfd2995f94b03c608ceb7090b97258cf2 X-VCS-Branch: master Date: Mon, 22 Feb 2016 08:38:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6d79b210-72b3-46f5-9768-fb50191c460e X-Archives-Hash: 029e0d17e597c576689085a86eaafe40 commit: 7882cf4cfd2995f94b03c608ceb7090b97258cf2 Author: Grégory Salvan gmail com> AuthorDate: Sat Feb 20 22:42:39 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Feb 22 08:36:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7882cf4c Added build patch from fedora (fix Mesh :: ParallelMetis linking error...) .../netgen/files/netgen-5.3.1_build.patch | 372 +++++++++++++++++++++ sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 + 2 files changed, 374 insertions(+) diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch new file mode 100644 index 0000000..dd8d395 --- /dev/null +++ b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch @@ -0,0 +1,372 @@ +diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac +--- netgen-5.3.1/configure.ac 2014-10-07 21:38:21.990021106 +0200 ++++ netgen-5.3.1-new/configure.ac 2014-10-07 21:39:14.530034275 +0200 +@@ -35,15 +35,15 @@ AC_ARG_WITH([occ], + [AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in directory dir])], + [occdir=$withval] + [occon=true], +- [occdir=/opt/OpenCASCADE] ++ [occdir=/usr] + ) + + + + if test a$occon = atrue ; then + +- AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"]) +- 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"]) ++ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I/usr/include/oce"]) ++ 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"]) + + # -lTKDCAF + +@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui], + [AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])], + [if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi]) + +-metisdir=/usr/local ++metisdir=/usr + AC_ARG_WITH([metis], + [AC_HELP_STRING([--with-metis=dir],[path to metis 5.x])], + [metisdir=$withval], +- [metisdir=/usr/local] ++ [metisdir=/usr] + ) + + AC_ARG_ENABLE([parallel], + [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], +- [AC_SUBST([MPI_INCLUDES], "-I$metisdir/include -DMETIS")] ++ [AC_SUBST([MPI_INCLUDES], "-DMETIS")] + [CXXFLAGS="$CXXFLAGS -DPARALLEL"] +- [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")] ++ [AC_SUBST([MPI_LIBS], "-lmetis")] + ) + # -DVTRACE + # -lvt-hyb +diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makefile.am +--- netgen-5.3.1/libsrc/csg/Makefile.am 2014-10-07 21:38:21.787017193 +0200 ++++ netgen-5.3.1-new/libsrc/csg/Makefile.am 2014-10-07 21:39:14.530034275 +0200 +@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) + METASOURCES = AUTO + +-lib_LTLIBRARIES = libcsg.la ++lib_LTLIBRARIES = libngcsg.la + + +-libcsg_la_SOURCES = algprim.cpp brick.cpp \ ++libngcsg_la_SOURCES = algprim.cpp brick.cpp \ + bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp \ + explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp \ + manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \ + solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp + +-libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la ++libngcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la + + + + if NGGUI +-lib_LTLIBRARIES += libcsgvis.la ++lib_LTLIBRARIES += libngcsgvis.la + +-libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp +-libcsgvis_la_LIBADD = libcsg.la ++libngcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp ++libngcsgvis_la_LIBADD = libngcsg.la + endif + + # $(top_builddir)/libsrc/geom2d/libgeom2d.la +diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/general/Makefile.am +--- netgen-5.3.1/libsrc/general/Makefile.am 2014-10-07 21:38:21.638014320 +0200 ++++ netgen-5.3.1-new/libsrc/general/Makefile.am 2014-10-07 21:39:14.531034296 +0200 +@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp + + AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include + METASOURCES = AUTO +-noinst_LTLIBRARIES = libgen.la +-libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ ++noinst_LTLIBRARIES = libnggen.la ++libnggen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ + hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ + profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \ + mpi_interface.cpp gzstream.cpp +diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am netgen-5.3.1-new/libsrc/geom2d/Makefile.am +--- netgen-5.3.1/libsrc/geom2d/Makefile.am 2014-10-07 21:38:21.832018060 +0200 ++++ netgen-5.3.1-new/libsrc/geom2d/Makefile.am 2014-10-07 21:39:14.531034296 +0200 +@@ -4,18 +4,18 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc + + METASOURCES = AUTO + +-lib_LTLIBRARIES = libgeom2d.la ++lib_LTLIBRARIES = libnggeom2d.la + + if NGGUI +-lib_LTLIBRARIES += libgeom2dvis.la ++lib_LTLIBRARIES += libnggeom2dvis.la + endif + + + +-libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp +-libgeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la ++libnggeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp ++libnggeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS) + +-libgeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp +-libgeom2dvis_la_LIBADD = libgeom2d.la ++libnggeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp ++libnggeom2dvis_la_LIBADD = libnggeom2d.la -lGL $(MPI_LIBS) + + +diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am netgen-5.3.1-new/libsrc/gprim/Makefile.am +--- netgen-5.3.1/libsrc/gprim/Makefile.am 2014-10-07 21:38:21.719015882 +0200 ++++ netgen-5.3.1-new/libsrc/gprim/Makefile.am 2014-10-07 21:39:14.531034296 +0200 +@@ -2,6 +2,6 @@ noinst_HEADERS = adtree.hpp geom3d.hpp + + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include + METASOURCES = AUTO +-noinst_LTLIBRARIES = libgprim.la +-libgprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ ++noinst_LTLIBRARIES = libnggprim.la ++libnggprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ + geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp +diff -rupN netgen-5.3.1/libsrc/interface/Makefile.am netgen-5.3.1-new/libsrc/interface/Makefile.am +--- netgen-5.3.1/libsrc/interface/Makefile.am 2014-10-07 21:38:21.846018330 +0200 ++++ netgen-5.3.1-new/libsrc/interface/Makefile.am 2014-10-07 21:44:17.523887314 +0200 +@@ -2,14 +2,14 @@ noinst_HEADERS = writeuser.hpp + + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(MPI_INCLUDES) $(TCL_INCLUDES) -DOPENGL + METASOURCES = AUTO +-lib_LTLIBRARIES = libinterface.la +-libinterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \ ++lib_LTLIBRARIES = libnginterface.la ++libnginterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \ + read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \ + writedolfin.cpp writeelmer.cpp writefeap.cpp writefluent.cpp writegmsh.cpp writejcm.cpp \ + writepermas.cpp writetecplot.cpp writetet.cpp writetochnog.cpp writeuser.cpp \ + wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp + + +-libinterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la ++libnginterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la + + # libinterface_la_LDFLAGS = -rdynamic +diff -rupN netgen-5.3.1/libsrc/linalg/Makefile.am netgen-5.3.1-new/libsrc/linalg/Makefile.am +--- netgen-5.3.1/libsrc/linalg/Makefile.am 2014-10-07 21:38:21.667014879 +0200 ++++ netgen-5.3.1-new/libsrc/linalg/Makefile.am 2014-10-07 21:39:14.532034315 +0200 +@@ -1,8 +1,8 @@ + noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp opti.hpp + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include + METASOURCES = AUTO +-noinst_LTLIBRARIES = libla.la +-libla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp ++noinst_LTLIBRARIES = libngla.la ++libngla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp + + # vector.cpp + +diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshing/Makefile.am +--- netgen-5.3.1/libsrc/meshing/Makefile.am 2014-10-07 21:38:21.895019275 +0200 ++++ netgen-5.3.1-new/libsrc/meshing/Makefile.am 2014-10-07 21:39:14.532034315 +0200 +@@ -15,9 +15,9 @@ clusters.hpp hprefinement.hpp improve3.h + + METASOURCES = AUTO + +-lib_LTLIBRARIES = libmesh.la ++lib_LTLIBRARIES = libngmesh.la + +-libmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ ++libngmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ + clusters.cpp curvedelems.cpp delaunay.cpp delaunay2d.cpp \ + geomsearch.cpp global.cpp hprefinement.cpp improve2.cpp \ + improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp \ +@@ -30,8 +30,8 @@ libmesh_la_SOURCES = adfront2.cpp adfron + topology.cpp triarls.cpp validate.cpp zrefine.cpp bcfunctions.cpp \ + parallelmesh.cpp paralleltop.cpp paralleltop.hpp basegeom.cpp + +-libmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libla.la \ +- $(top_builddir)/libsrc/gprim/libgprim.la \ +- $(top_builddir)/libsrc/general/libgen.la \ +- -lz ++libngmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libngla.la \ ++ $(top_builddir)/libsrc/gprim/libnggprim.la \ ++ $(top_builddir)/libsrc/general/libnggen.la \ ++ $(MPI_LIBS) -lz + +diff -rupN netgen-5.3.1/libsrc/occ/Makefile.am netgen-5.3.1-new/libsrc/occ/Makefile.am +--- netgen-5.3.1/libsrc/occ/Makefile.am 2014-10-07 21:38:21.739016267 +0200 ++++ netgen-5.3.1-new/libsrc/occ/Makefile.am 2014-10-07 21:39:14.533034334 +0200 +@@ -14,20 +14,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc + + METASOURCES = AUTO + +-lib_LTLIBRARIES = libocc.la ++lib_LTLIBRARIES = libngocc.la + + if NGGUI +-lib_LTLIBRARIES += liboccvis.la ++lib_LTLIBRARIES += libngoccvis.la + endif + + +-libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ ++libngocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ + Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \ + occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp + +-libocc_la_LIBADD = $(OCCLIBS) ++libngocc_la_LIBADD = $(OCCLIBS) + +-liboccvis_la_SOURCES = occpkg.cpp vsocc.cpp +-liboccvis_la_LIBADD = libocc.la ++libngoccvis_la_SOURCES = occpkg.cpp vsocc.cpp ++libngoccvis_la_LIBADD = libngocc.la $(TCL_LIB_SPEC) + + +diff -rupN netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen-5.3.1-new/libsrc/stlgeom/Makefile.am +--- netgen-5.3.1/libsrc/stlgeom/Makefile.am 2014-10-07 21:38:21.683015188 +0200 ++++ netgen-5.3.1-new/libsrc/stlgeom/Makefile.am 2014-10-07 21:39:14.533034334 +0200 +@@ -4,18 +4,18 @@ stltool.hpp stltopology.hpp vsstl.hpp + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) + METASOURCES = AUTO + +-lib_LTLIBRARIES = libstl.la ++lib_LTLIBRARIES = libngstl.la + + if NGGUI +-lib_LTLIBRARIES += libstlvis.la ++lib_LTLIBRARIES += libngstlvis.la + endif + +-libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ ++libngstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ + stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp + + +-libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp +-libstlvis_la_LIBADD = libstl.la +-libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la ++libngstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp ++libngstlvis_la_LIBADD = libngstl.la -lGL $(MPI_LIBS) $(TCL_LIB_SPEC) ++libngstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS) + # libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la + +diff -rupN netgen-5.3.1/libsrc/visualization/Makefile.am netgen-5.3.1-new/libsrc/visualization/Makefile.am +--- netgen-5.3.1/libsrc/visualization/Makefile.am 2014-10-07 21:38:21.822017867 +0200 ++++ netgen-5.3.1-new/libsrc/visualization/Makefile.am 2014-10-07 21:39:14.533034334 +0200 +@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_s + METASOURCES = AUTO + + if NGGUI +-noinst_LTLIBRARIES = libvisual.la ++noinst_LTLIBRARIES = libngvisual.la + endif + + +-libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ ++libngvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ + vsfieldlines.cpp vsmesh.cpp vssolution.cpp importsolution.cpp + +- ++libngvisual_la_LIBADD = -lGL +diff -rupN netgen-5.3.1/ng/Makefile.am netgen-5.3.1-new/ng/Makefile.am +--- netgen-5.3.1/ng/Makefile.am 2014-10-07 21:38:21.973020778 +0200 ++++ netgen-5.3.1-new/ng/Makefile.am 2014-10-07 21:39:14.534034353 +0200 +@@ -17,21 +17,18 @@ MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lm + endif + # -lpardiso500-GNU472-X86-64 -lgfortran + +-netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \ +- $(top_builddir)/libsrc/csg/libcsgvis.la \ +- $(top_builddir)/libsrc/csg/libcsg.la \ +- $(top_builddir)/libsrc/interface/libinterface.la \ +- $(top_builddir)/libsrc/meshing/libmesh.la \ +- -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) +- +- +-# +-# $(top_builddir)/libsrc/occ/liboccvis.la +-# $(top_builddir)/libsrc/occ/libocc.la +-# $(top_builddir)/libsrc/stlgeom/libstlvis.la +-# $(top_builddir)/libsrc/stlgeom/libstl.la +-# $(top_builddir)/libsrc/geom2d/libgeom2d.la +-# $(top_builddir)/libsrc/geom2d/libgeom2dvis.la ++netgen_LDADD = $(top_builddir)/libsrc/visualization/libngvisual.la \ ++ $(top_builddir)/libsrc/csg/libngcsgvis.la \ ++ $(top_builddir)/libsrc/csg/libngcsg.la \ ++ $(top_builddir)/libsrc/interface/libnginterface.la \ ++ $(top_builddir)/libsrc/meshing/libngmesh.la \ ++ $(top_builddir)/libsrc/occ/libngoccvis.la \ ++ $(top_builddir)/libsrc/occ/libngocc.la \ ++ $(top_builddir)/libsrc/stlgeom/libngstlvis.la \ ++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ ++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ ++ $(top_builddir)/libsrc/geom2d/libnggeom2dvis.la \ ++ -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) + + + # add for static linkage of ngsolve: +diff -rupN netgen-5.3.1/nglib/Makefile.am netgen-5.3.1-new/nglib/Makefile.am +--- netgen-5.3.1/nglib/Makefile.am 2014-10-07 21:38:21.552012662 +0200 ++++ netgen-5.3.1-new/nglib/Makefile.am 2014-10-07 21:39:27.915292493 +0200 +@@ -8,15 +8,15 @@ lib_LTLIBRARIES = libnglib.la + libnglib_la_SOURCES = nglib.cpp + + libnglib_la_LIBADD = \ +- $(top_builddir)/libsrc/interface/libinterface.la \ +- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ +- $(top_builddir)/libsrc/csg/libcsg.la \ +- $(top_builddir)/libsrc/stlgeom/libstl.la \ +- $(top_builddir)/libsrc/occ/libocc.la \ +- $(top_builddir)/libsrc/meshing/libmesh.la \ ++ $(top_builddir)/libsrc/interface/libnginterface.la \ ++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ ++ $(top_builddir)/libsrc/csg/libngcsg.la \ ++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ ++ $(top_builddir)/libsrc/occ/libngocc.la \ ++ $(top_builddir)/libsrc/meshing/libngmesh.la \ + $(OCCLIBS) $(MPI_LIBS) + +-libnglib_la_LDFLAGS = -avoid-version ++libnglib_la_LDFLAGS = -release $(PACKAGE_VERSION) + # -rdynamic + + +@@ -25,24 +25,24 @@ bin_PROGRAMS = ng_vol ng_stl + + ng_vol_SOURCES = ng_vol.cpp + ng_vol_LDADD = libnglib.la \ +- $(top_builddir)/libsrc/interface/libinterface.la \ +- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ +- $(top_builddir)/libsrc/csg/libcsg.la \ +- $(top_builddir)/libsrc/stlgeom/libstl.la \ +- $(top_builddir)/libsrc/occ/libocc.la \ +- $(top_builddir)/libsrc/meshing/libmesh.la \ ++ $(top_builddir)/libsrc/interface/libnginterface.la \ ++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ ++ $(top_builddir)/libsrc/csg/libngcsg.la \ ++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ ++ $(top_builddir)/libsrc/occ/libngocc.la \ ++ $(top_builddir)/libsrc/meshing/libngmesh.la \ + $(OCCLIBS) $(MPI_LIBS) + + + + ng_stl_SOURCES = ng_stl.cpp + ng_stl_LDADD = libnglib.la \ +- $(top_builddir)/libsrc/interface/libinterface.la \ +- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ +- $(top_builddir)/libsrc/csg/libcsg.la \ +- $(top_builddir)/libsrc/stlgeom/libstl.la \ +- $(top_builddir)/libsrc/occ/libocc.la \ +- $(top_builddir)/libsrc/meshing/libmesh.la \ ++ $(top_builddir)/libsrc/interface/libnginterface.la \ ++ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ ++ $(top_builddir)/libsrc/csg/libngcsg.la \ ++ $(top_builddir)/libsrc/stlgeom/libngstl.la \ ++ $(top_builddir)/libsrc/occ/libngocc.la \ ++ $(top_builddir)/libsrc/meshing/libngmesh.la \ + $(OCCLIBS) $(MPI_LIBS) + + # ng_occ_SOURCES = ng_occ.cpp diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild index 0c2da7d..5cdb4ab 100644 --- a/sci-mathematics/netgen/netgen-5.3.1.ebuild +++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild @@ -38,6 +38,8 @@ src_prepare() { # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch" epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch" + # Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch + epatch "${FILESDIR}/${PN}-5.3.1_build.patch" if use mpi; then export CC=mpicc export CXX=mpic++