| 1 |
commit: 42b0f9c7e6dbd0b751f6728f226cd4c5ed946cc6 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 21 21:29:51 2015 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 21 21:35:54 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b0f9c7 |
| 7 |
|
| 8 |
sci-visualization/paraview: Fix configuration issue with dev-db/mysql-6.1.6, bug #560916 |
| 9 |
|
| 10 |
dev-db/mysql-5.5.29 and older have left the tree two years ago. Remove |
| 11 |
buggy compatibility code that identified version 6.1.6 being less than |
| 12 |
5.5.29... |
| 13 |
|
| 14 |
Gentoo-Bug: 560916 |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.20.1 |
| 17 |
|
| 18 |
sci-visualization/paraview/paraview-4.3.1.ebuild | 14 -------------- |
| 19 |
sci-visualization/paraview/paraview-4.4.0.ebuild | 14 -------------- |
| 20 |
2 files changed, 28 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild |
| 23 |
index c978762..c9a1b26 100644 |
| 24 |
--- a/sci-visualization/paraview/paraview-4.3.1.ebuild |
| 25 |
+++ b/sci-visualization/paraview/paraview-4.3.1.ebuild |
| 26 |
@@ -125,18 +125,6 @@ src_prepare() { |
| 27 |
} |
| 28 |
|
| 29 |
src_configure() { |
| 30 |
- local mysql_lib mysql_includedir |
| 31 |
- |
| 32 |
- if use mysql ; then |
| 33 |
- if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then |
| 34 |
- mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" |
| 35 |
- mysql_includedir="/usr/include/mysql" |
| 36 |
- else |
| 37 |
- mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" |
| 38 |
- mysql_includedir="$(mysql_config --variable=pkgincludedir)" |
| 39 |
- fi |
| 40 |
- fi |
| 41 |
- |
| 42 |
# VTK_USE_SYSTEM_QTTESTING |
| 43 |
# PARAVIEW_USE_SYSTEM_AUTOBAHN |
| 44 |
local mycmakeargs=( |
| 45 |
@@ -171,8 +159,6 @@ src_configure() { |
| 46 |
-DVTK_USE_FFMPEG_ENCODER=OFF |
| 47 |
-DPROTOC_LOCATION=$(type -P protoc) |
| 48 |
-DVTK_Group_StandAlone=ON |
| 49 |
- -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" |
| 50 |
- -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" |
| 51 |
# force this module due to incorrect build system deps |
| 52 |
# wrt bug 460528 |
| 53 |
-DModule_vtkUtilitiesProcessXML=ON |
| 54 |
|
| 55 |
diff --git a/sci-visualization/paraview/paraview-4.4.0.ebuild b/sci-visualization/paraview/paraview-4.4.0.ebuild |
| 56 |
index 21ac4ab..89dd7f3 100644 |
| 57 |
--- a/sci-visualization/paraview/paraview-4.4.0.ebuild |
| 58 |
+++ b/sci-visualization/paraview/paraview-4.4.0.ebuild |
| 59 |
@@ -123,18 +123,6 @@ src_prepare() { |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
- local mysql_lib mysql_includedir |
| 64 |
- |
| 65 |
- if use mysql ; then |
| 66 |
- if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then |
| 67 |
- mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" |
| 68 |
- mysql_includedir="/usr/include/mysql" |
| 69 |
- else |
| 70 |
- mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" |
| 71 |
- mysql_includedir="$(mysql_config --variable=pkgincludedir)" |
| 72 |
- fi |
| 73 |
- fi |
| 74 |
- |
| 75 |
# VTK_USE_SYSTEM_QTTESTING |
| 76 |
# PARAVIEW_USE_SYSTEM_AUTOBAHN |
| 77 |
local mycmakeargs=( |
| 78 |
@@ -169,8 +157,6 @@ src_configure() { |
| 79 |
-DVTK_USE_FFMPEG_ENCODER=OFF |
| 80 |
-DPROTOC_LOCATION=$(type -P protoc) |
| 81 |
-DVTK_Group_StandAlone=ON |
| 82 |
- -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" |
| 83 |
- -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" |
| 84 |
# force this module due to incorrect build system deps |
| 85 |
# wrt bug 460528 |
| 86 |
-DModule_vtkUtilitiesProcessXML=ON |
Archives