diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2012-10-08 20:17:49 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-10-08 20:17:49 +1100 |
| commit | 4e1aa27beb6572366c72812b2a51573f48da83d6 (patch) | |
| tree | 76354ebe491b6273fd18a3e382d19c5f4d800caa /kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch | |
| parent | 72923804acc795f912f95128c6b38089c3029e9c (diff) | |
| download | kde-4e1aa27beb6572366c72812b2a51573f48da83d6.tar.gz kde-4e1aa27beb6572366c72812b2a51573f48da83d6.tar.bz2 kde-4e1aa27beb6572366c72812b2a51573f48da83d6.zip | |
[kde-base/kdelibs] Update Python byte compilation patch by Arfrever, wrt bug #437410.
(Portage version: 2.1.11.24/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch')
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch new file mode 100644 index 00000000000..fbd14aee245 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch @@ -0,0 +1,103 @@ +--- cmake/modules/PythonMacros.cmake ++++ cmake/modules/PythonMacros.cmake +@@ -24,52 +24,54 @@ + INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR}) + + # Byte compile and install the .pyc file. +- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) +- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) +- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) +- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) +- +- if(WIN32) +- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") +- endif(WIN32) +- +- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) +- +- # Python 3.2 changed the pyc file location +- IF(PYTHON_SHORT_VERSION GREATER 3.1) +- # To get the right version for suffix +- STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION}) +- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc) +- ELSE(PYTHON_SHORT_VERSION GREATER 3.1) +- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) +- ENDIF(PYTHON_SHORT_VERSION GREATER 3.1) +- +- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) +- +- SET(_message "Byte-compiling ${_bin_py}") +- +- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) +- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. +- ADD_CUSTOM_COMMAND( +- TARGET compile_python_files +- COMMAND ${CMAKE_COMMAND} -E echo ${_message} +- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} +- DEPENDS ${_absfilename} +- ) +- ELSE(_abs_bin_py STREQUAL ${_absfilename}) +- ADD_CUSTOM_COMMAND( +- TARGET compile_python_files +- COMMAND ${CMAKE_COMMAND} -E echo ${_message} +- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} +- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} +- DEPENDS ${_absfilename} +- ) +- ENDIF(_abs_bin_py STREQUAL ${_absfilename}) +- +- IF(PYTHON_SHORT_VERSION GREATER 3.1) +- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/) +- ELSE (PYTHON_SHORT_VERSION GREATER 3.1) ++ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") ++ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) ++ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) ++ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) ++ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) ++ ++ if(WIN32) ++ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") ++ endif(WIN32) ++ ++ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) ++ ++ # Python 3.2 changed the pyc file location ++ IF(PYTHON_SHORT_VERSION GREATER 3.1) ++ # To get the right version for suffix ++ STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION}) ++ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc) ++ ELSE(PYTHON_SHORT_VERSION GREATER 3.1) ++ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) ++ ENDIF(PYTHON_SHORT_VERSION GREATER 3.1) ++ ++ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) ++ ++ SET(_message "Byte-compiling ${_bin_py}") ++ ++ GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) ++ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. ++ ADD_CUSTOM_COMMAND( ++ TARGET compile_python_files ++ COMMAND ${CMAKE_COMMAND} -E echo ${_message} ++ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} ++ DEPENDS ${_absfilename} ++ ) ++ ELSE(_abs_bin_py STREQUAL ${_absfilename}) ++ ADD_CUSTOM_COMMAND( ++ TARGET compile_python_files ++ COMMAND ${CMAKE_COMMAND} -E echo ${_message} ++ COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} ++ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} ++ DEPENDS ${_absfilename} ++ ) ++ ENDIF(_abs_bin_py STREQUAL ${_absfilename}) ++ ++ IF(PYTHON_SHORT_VERSION GREATER 3.1) ++ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/) ++ ELSE (PYTHON_SHORT_VERSION GREATER 3.1) + INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}) +- ENDIF (PYTHON_SHORT_VERSION GREATER 3.1) ++ ENDIF (PYTHON_SHORT_VERSION GREATER 3.1) + ++ ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") + ENDMACRO(PYTHON_INSTALL) |