| 1 |
hasufell 13/07/27 23:53:59 |
| 2 |
|
| 3 |
Modified: ChangeLog paraview-4.0.1.ebuild |
| 4 |
Log: |
| 5 |
fix build with stable dev-db/mysql wrt #478250 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.73 sci-visualization/paraview/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/ChangeLog?rev=1.73&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/ChangeLog?rev=1.73&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/ChangeLog?r1=1.72&r2=1.73 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v |
| 19 |
retrieving revision 1.72 |
| 20 |
retrieving revision 1.73 |
| 21 |
diff -u -r1.72 -r1.73 |
| 22 |
--- ChangeLog 27 Jul 2013 21:48:12 -0000 1.72 |
| 23 |
+++ ChangeLog 27 Jul 2013 23:53:59 -0000 1.73 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for sci-visualization/paraview |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.72 2013/07/27 21:48:12 hasufell Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.73 2013/07/27 23:53:59 hasufell Exp $ |
| 29 |
+ |
| 30 |
+ 28 Jul 2013; Julian Ospald <hasufell@g.o> paraview-4.0.1.ebuild: |
| 31 |
+ fix build with stable dev-db/mysql wrt #478250 |
| 32 |
|
| 33 |
27 Jul 2013; Julian Ospald <hasufell@g.o> -paraview-3.98.0.ebuild, |
| 34 |
-paraview-3.98.0-r1.ebuild, -files/paraview-3.98.0-gcc-4.7.patch, |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 sci-visualization/paraview/paraview-4.0.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: paraview-4.0.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- paraview-4.0.1.ebuild 24 Jul 2013 11:16:23 -0000 1.2 |
| 51 |
+++ paraview-4.0.1.ebuild 27 Jul 2013 23:53:59 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v 1.2 2013/07/24 11:16:23 hasufell Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v 1.3 2013/07/27 23:53:59 hasufell Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
@@ -116,6 +116,16 @@ |
| 61 |
} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
+ local mysql_lib mysql_includedir |
| 65 |
+ |
| 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 |
+ |
| 74 |
# TODO: use system protobuf, jsoncpp |
| 75 |
# VTK_USE_SYSTEM_QTTESTING |
| 76 |
# PARAVIEW_USE_SYSTEM_AUTOBAHN |
| 77 |
@@ -149,8 +159,8 @@ |
| 78 |
-DVTK_USE_FFMPEG_ENCODER=OFF |
| 79 |
-DPROTOC_LOCATION=$(type -P protoc) |
| 80 |
-DVTK_Group_StandAlone=ON |
| 81 |
- -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "$(mysql_config --variable=pkgincludedir)" "")" |
| 82 |
- -DMYSQL_LIBRARY="$(usex mysql "$(mysql_config --variable=pkglibdir)/libmysqlclient.so" "")" |
| 83 |
+ -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" |
| 84 |
+ -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" |
| 85 |
# force this module due to incorrect build system deps |
| 86 |
# wrt bug 460528 |
| 87 |
-DModule_vtkUtilitiesProcessXML=ON |
Archives