diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-07-27 23:53:59 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-07-27 23:53:59 +0000 |
| commit | 3f2fad794438edc89a68f9fe44fa6da10a0c92ec (patch) | |
| tree | efcc26e690293532158c0c1cd4ff8cd2cd357a0c /sci-visualization/paraview | |
| parent | Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5. Fixe... (diff) | |
| download | gentoo-2-3f2fad794438edc89a68f9fe44fa6da10a0c92ec.tar.gz gentoo-2-3f2fad794438edc89a68f9fe44fa6da10a0c92ec.tar.bz2 gentoo-2-3f2fad794438edc89a68f9fe44fa6da10a0c92ec.zip | |
fix build with stable dev-db/mysql wrt #478250
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'sci-visualization/paraview')
| -rw-r--r-- | sci-visualization/paraview/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-visualization/paraview/paraview-4.0.1.ebuild | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 1d3332af2421..2622c8c5fb79 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-visualization/paraview # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.72 2013/07/27 21:48:12 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.73 2013/07/27 23:53:59 hasufell Exp $ + + 28 Jul 2013; Julian Ospald <hasufell@gentoo.org> paraview-4.0.1.ebuild: + fix build with stable dev-db/mysql wrt #478250 27 Jul 2013; Julian Ospald <hasufell@gentoo.org> -paraview-3.98.0.ebuild, -paraview-3.98.0-r1.ebuild, -files/paraview-3.98.0-gcc-4.7.patch, diff --git a/sci-visualization/paraview/paraview-4.0.1.ebuild b/sci-visualization/paraview/paraview-4.0.1.ebuild index ffb829a3d245..6df0ee96e2bd 100644 --- a/sci-visualization/paraview/paraview-4.0.1.ebuild +++ b/sci-visualization/paraview/paraview-4.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v 1.2 2013/07/24 11:16:23 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v 1.3 2013/07/27 23:53:59 hasufell Exp $ EAPI=5 @@ -116,6 +116,16 @@ src_prepare() { } src_configure() { + local mysql_lib mysql_includedir + + if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then + mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" + mysql_includedir="/usr/include/mysql" + else + mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" + mysql_includedir="$(mysql_config --variable=pkgincludedir)" + fi + # TODO: use system protobuf, jsoncpp # VTK_USE_SYSTEM_QTTESTING # PARAVIEW_USE_SYSTEM_AUTOBAHN @@ -149,8 +159,8 @@ src_configure() { -DVTK_USE_FFMPEG_ENCODER=OFF -DPROTOC_LOCATION=$(type -P protoc) -DVTK_Group_StandAlone=ON - -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "$(mysql_config --variable=pkgincludedir)" "")" - -DMYSQL_LIBRARY="$(usex mysql "$(mysql_config --variable=pkglibdir)/libmysqlclient.so" "")" + -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" + -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" # force this module due to incorrect build system deps # wrt bug 460528 -DModule_vtkUtilitiesProcessXML=ON |