From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F11BD1382C5 for ; Fri, 26 Mar 2021 00:57:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F216E07A5; Fri, 26 Mar 2021 00:57:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C1A6E07A5 for ; Fri, 26 Mar 2021 00:57:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63E70340D8D for ; Fri, 26 Mar 2021 00:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAE3F4A8 for ; Fri, 26 Mar 2021 00:57:13 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1616720184.228d6b6db2105f56271f66434d329edc19afb852.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/vtk/vtk-8.2.0-r1.ebuild sci-libs/vtk/vtk-8.2.0.ebuild X-VCS-Directories: sci-libs/vtk/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 228d6b6db2105f56271f66434d329edc19afb852 X-VCS-Branch: master Date: Fri, 26 Mar 2021 00:57:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 556ffb5b-44c2-41ad-bbdc-e2dd13b7c261 X-Archives-Hash: 161b7e0fee2e34c8c51b04856a0cbab6 commit: 228d6b6db2105f56271f66434d329edc19afb852 Author: Alexei Colin alexeicolin com> AuthorDate: Tue Feb 16 15:12:06 2021 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri Mar 26 00:56:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228d6b6d sci-libs/vtk: 8.2.0: update deprecated var for setting Python site-dir Problem: On some platforms (ppc64le), Python modules are installed into $EPREFIX/usr/lib64/pythonX.Y/site-packages instead of $EPREFIX/usr/lib/pythonX.Y/site-packages Reason: The ebuild sets VTK_INSTALL_PYTHON_MODULE_DIR, but it has been deprecated and thus has no effect. Thus, the install directory used is the default install directory, and for some reason it's /usr/lib64 instead of /usr/lib. The only reference to the deprecated var in v8.2.0 is to print the deprecation warning: ./CMake/vtkDirectories.cmake:29:if(DEFINED VTK_INSTALL_PYTHON_MODULE_DIR) ./CMake/vtkDirectories.cmake-30- message(WARNING ./CMake/vtkDirectories.cmake:31: "VTK_INSTALL_PYTHON_MODULE_DIR is no longer supported. " ./CMake/vtkDirectories.cmake-32- "Set `VTK_PYTHON_SITE_PACKAGES_SUFFIX` instead, although not needed in most cases.") ./CMake/vtkDirectories.cmake-33-endif() Note that in versions >8.2.0, this warning has been removed, too. The fix: VTK_INSTALL_PYTHON_MODULES_DIR is still honored, including in >8.2.0, so use it instead. Note that VTK_PYTHON_SITE_PACKAGES_SUFFIX does not help because it is appended after the lib directory in the path. Perhaps a deeper fix might be to figure out why the default lib dir is set to lib64 instead of lib. I didn't investigate this further. The ebuild already intends to override the default, and this commit just fixes that override. I don't know if the default dir is still broken in >8.2.0, i.e. whether it is still necessary for the >8.2.0 ebuilds to override the default installation directory. There have been related changes, though, see at least this commit that's not in 8.2.0 but is in master: commit 4c42ff417c209087bf0058a9eb2614928943156b Author: Ben Boeckel kitware.com> Date: Thu Oct 18 13:17:11 2018 -0400 vtkPython: expose VTK_PYTHONPATH to consumers of VTK Signed-off-by: Alexei Colin alexeicolin.com> Signed-off-by: Michael Orlitzky gentoo.org> sci-libs/vtk/vtk-8.2.0-r1.ebuild | 2 +- sci-libs/vtk/vtk-8.2.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild index 12dba470d8a..9ab67fa0c1e 100644 --- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild +++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild @@ -254,7 +254,7 @@ src_configure() { if use python; then mycmakeargs+=( - -DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)" + -DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)" -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild index 0c4458bbb7f..0eab965aa3f 100644 --- a/sci-libs/vtk/vtk-8.2.0.ebuild +++ b/sci-libs/vtk/vtk-8.2.0.ebuild @@ -248,7 +248,7 @@ src_configure() { if use python; then mycmakeargs+=( - -DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)" + -DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)" -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"