aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-11-12 19:05:22 +0100
committerJustin Lecher <jlec@gentoo.org>2012-11-12 19:05:22 +0100
commitbde6ca597dfdd77d93d7bc87628cf097f8f2da19 (patch)
treec3f42d4bacaff2ec9dbab901e155269588e1b0bd /sci-libs/gmsh
parentsci-libs/med: Fix SRC_URI; move to EAPI=5 (diff)
downloadsci-bde6ca597dfdd77d93d7bc87628cf097f8f2da19.tar.gz
sci-bde6ca597dfdd77d93d7bc87628cf097f8f2da19.tar.bz2
sci-bde6ca597dfdd77d93d7bc87628cf097f8f2da19.zip
sci-libs/gmsh: Fix link problems with gold
Package-Manager: portage-2.2.0_alpha142
Diffstat (limited to 'sci-libs/gmsh')
-rw-r--r--sci-libs/gmsh/ChangeLog6
-rw-r--r--sci-libs/gmsh/files/gmsh-2.5.0-link.patch16
-rw-r--r--sci-libs/gmsh/gmsh-2.5.0-r1.ebuild4
-rw-r--r--sci-libs/gmsh/metadata.xml2
4 files changed, 25 insertions, 3 deletions
diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog
index d60c82fe3..5cc5d2282 100644
--- a/sci-libs/gmsh/ChangeLog
+++ b/sci-libs/gmsh/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/gmsh
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Nov 2012; Justin Lecher <jlec@gentoo.org> gmsh-2.5.0-r1.ebuild,
+ +files/gmsh-2.5.0-link.patch, metadata.xml:
+ Fix link problems with gold
+
24 Jun 2011; Justin Lecher <jlec@gentoo.org> gmsh-2.5.0.ebuild,
gmsh-9999.ebuild:
Streamlined fortran-2 eclass usage
diff --git a/sci-libs/gmsh/files/gmsh-2.5.0-link.patch b/sci-libs/gmsh/files/gmsh-2.5.0-link.patch
new file mode 100644
index 000000000..f019cae39
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-2.5.0-link.patch
@@ -0,0 +1,16 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5549d6a..48a106d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -879,7 +879,7 @@ elseif(HAVE_QT)
+ else(HAVE_FLTK)
+ add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
+ endif(HAVE_FLTK)
+-target_link_libraries(gmsh ${LINK_LIBRARIES})
++target_link_libraries(gmsh ${LINK_LIBRARIES} -ldl)
+
+ # increase stack to 16Mb on Windows to avoid overflows in recursive
+ # tet classification for large 3D Delaunay grids
diff --git a/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild b/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
index 16b4c6b7f..8f95cc1ff 100644
--- a/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
+++ b/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
@@ -37,7 +37,9 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P}-source
-PATCHES=( "${FILESDIR}/${P}-libpng-1.5.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-link.patch"
+ "${FILESDIR}/${P}-libpng-1.5.patch" )
REQUIRED_USE="taucs? ( metis )"
diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index ed9746795..8a82a02aa 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
+ <herd>sci</herd>
<use>
<flag name="chaco"> Enables chaco partitioner support</flag>
<flag name="cgns"> Enables cgns output support</flag>