From 92a435fd671f982087b5a33542c88302a3047844 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@isae-supaero.fr>
Date: Fri, 6 Mar 2015 14:22:44 +0100
Subject: [PATCH] [wip/py-hla] Fix cmake for python 3.4
python3.4 -V now returns on stdout while before it returns on stdout. It
breaks pyHLA version detection. Use standard PYTHON_VERSION_STRING from
FindPythonInterp.cmake to do the test instead.
---
py-hla/Makefile | 1 +
py-hla/distinfo | 1 +
py-hla/patches/patch-ac | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 100644 py-hla/patches/patch-ac
diff --git a/py-hla/Makefile b/py-hla/Makefile
index 0776471f..fc3734ba 100644
--- a/py-hla/Makefile
+++ b/py-hla/Makefile
@@ -5,6 +5,7 @@
PKG_VERSION= 1.1.1
DISTNAME= PyHLA-${PKG_VERSION}-Source
PKGNAME= ${PKGTAG.python}-hla-${PKG_VERSION}
+PKGREVISION= 1
CATEGORIES= architecture
MASTER_SITES= http://gnu.mirrors.pair.com/savannah/savannah//certi/contrib/PyHLA/
diff --git a/py-hla/distinfo b/py-hla/distinfo
index 7caa177a..06545349 100644
--- a/py-hla/distinfo
+++ b/py-hla/distinfo
@@ -3,3 +3,4 @@ RMD160 (PyHLA-1.1.1-Source.tar.gz) = d2fdd7bbd9b5a45c1aa50aeaac3374fa9c465057
Size (PyHLA-1.1.1-Source.tar.gz) = 115908 bytes
SHA1 (patch-aa) = 6de74707e22cb4225e3a47af92b6ea896831568a
SHA1 (patch-ab) = 82665ec55ad932570223690030f33aeffe07350c
+SHA1 (patch-ac) = 7d8f95a3318012762b5961f8a86528d4a9f1c7f0
diff --git a/py-hla/patches/patch-ac b/py-hla/patches/patch-ac
new file mode 100644
index 00000000..ffc17462
--- /dev/null
+++ b/py-hla/patches/patch-ac
@@ -0,0 +1,34 @@
+--- CMakeLists.txt.orig 2015-03-06 13:50:52.047439570 +0100
++++ CMakeLists.txt 2015-03-06 13:54:32.655445126 +0100
+@@ -16,18 +16,11 @@
+
+ FIND_PACKAGE(PythonLibs REQUIRED)
+ FIND_PACKAGE(PythonInterp REQUIRED)
+-EXECUTE_PROCESS(
+- COMMAND "${PYTHON_EXECUTABLE}" "-V"
+- ERROR_VARIABLE PYTHON_VERSION_STRING
+- ERROR_STRIP_TRAILING_WHITESPACE)
+-STRING(
+- REGEX REPLACE "[A-Za-z\ ]*([0-9]+\\.[0-9]+\\.*[0-9]*)" "\\1"
+- PYTHON_VERSION "${PYTHON_VERSION_STRING}")
+-MESSAGE(STATUS "Using Python: ${PYTHON_VERSION}")
++MESSAGE(STATUS "Using Python: ${PYTHON_VERSION_STRING}")
+ SET(PYTHON_NEEDED_VERSION "2.5")
+-IF("${PYTHON_VERSION}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
+- message(FATAL_ERROR "You need at least Python ${PYTHON_NEEDED_VERSION}, found: ${PYTHON_VERSION}")
+-ENDIF("${PYTHON_VERSION}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
++IF("${PYTHON_VERSION_STRING}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
++ message(FATAL_ERROR "You need at least Python ${PYTHON_NEEDED_VERSION}, found: ${PYTHON_VERSION_STRING}")
++ENDIF("${PYTHON_VERSION_STRING}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
+
+ IF(NOT PYTHON_PACKAGES_PATH)
+ EXECUTE_PROCESS(
+@@ -63,7 +56,7 @@
+ IF (WIN32)
+ SET(CPACK_SOURCE_GENERATOR "ZIP")
+ SET(CPACK_GENERATOR "NSIS;ZIP")
+- SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-win32-py${PYTHON_VERSION}")
++ SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-win32-py${PYTHON_VERSION_STRING}")
+ ELSE (WIN32)
+ SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
+ SET(CPACK_GENERATOR "TGZ;ZIP;RPM")
--
GitLab