Date: Mon, 27 Mar 2017 10:49:43 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437020 - in head/x11/kdelibs4: . files Message-ID: <201703271049.v2RAnhnQ025737@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Mar 27 10:49:43 2017 New Revision: 437020 URL: https://svnweb.freebsd.org/changeset/ports/437020 Log: Ressurrect patch-cmake_modules_PythonMacros.cmake. It was deleted in the kdelibs4 update from r436971, but it contained some FreeBSD-specific code to build and install .pyo files. This should unbreak Python-based ports that use kdelibs4, such as devel/py-pykde. Added: head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake - copied, changed from r436970, head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake Modified: head/x11/kdelibs4/Makefile Modified: head/x11/kdelibs4/Makefile ============================================================================== --- head/x11/kdelibs4/Makefile Mon Mar 27 10:01:33 2017 (r437019) +++ head/x11/kdelibs4/Makefile Mon Mar 27 10:49:43 2017 (r437020) @@ -3,6 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_KDELIBS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org Copied and modified: head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake (from r436970, head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake) ============================================================================== --- head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake Sun Mar 26 15:39:14 2017 (r436970, copy source) +++ head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake Mon Mar 27 10:49:43 2017 (r437020) @@ -1,10 +1,6 @@ The pyo-related changes are (at least for now) FreeBSD-specific and are present in order to install .pyo files in addition to .pyc files when installing Python modules. - -The "--destination-dir" changes are required to fix PR 200018 and come from a -change landed upstream, 94f1d2f ("PythonMacros: specify destination directory -in byte-compiled files"). See patch-git_94f1d2f for more information. --- cmake/modules/PythonMacros.cmake +++ cmake/modules/PythonMacros.cmake @@ -41,16 +41,18 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) @@ -27,22 +23,18 @@ in byte-compiled files"). See patch-git_ string(REPLACE "/" "_" _rule_name "${_basepath}/${_bin_pyc}") add_custom_target("${_rule_name}" ALL) -@@ -60,7 +62,8 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) - add_custom_command( +@@ -61,6 +63,7 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) TARGET "${_rule_name}" COMMAND "${CMAKE_COMMAND}" -E echo "${_message}" -- COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}" -+ COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" + COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" + COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" DEPENDS "${_absfilename}" ) else() -@@ -68,12 +71,13 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) - TARGET "${_rule_name}" +@@ -69,11 +72,12 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) COMMAND "${CMAKE_COMMAND}" -E echo "${_message}" COMMAND "${CMAKE_COMMAND}" -E copy "${_absfilename}" "${_bin_py}" -- COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}" -+ COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" + COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" + COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" DEPENDS "${_absfilename}" )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703271049.v2RAnhnQ025737>