Update python3 to 3.5.7. Fix boost python2 compilation.

freeorion · Jun 8, 2019 · 0d7441d · 0d7441d
1 parent cd195f0
commit 0d7441d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -679,6 +679,7 @@ else()
     set(BOOST_OSX_SYSROOT "")
 endif()
 string(SUBSTRING "${PYTHON_VERSION}" 0 3 PYTHON_VERSION)
+string(SUBSTRING "${PYTHON3_VERSION}" 0 3 PYTHON3_VERSION)
 
 if(BUILD_SHARED_LIBS OR APPLE)
     set(BOOST_LINK "shared")

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,6 +5,7 @@ Notable changes to the FreeOrionSDK project will be documented in this file.
 ## v11 - TBA
 
 - Update boost version to 1.70
+- Add Python3 in version 3.5.7 to SDK
 - Update python-cmake-buildsystem from c3b8d532242efed85fb3cd77b0e39e424b6db475
   to 501869c2b124552dae669d5fd6b7e7101a7cc30c.
 - Pin Docker image to a stable and more recent base image
@@ -44,7 +45,6 @@ Notable changes to the FreeOrionSDK project will be documented in this file.
 - Use upstream conventions for freetype2 ft2build.h install path.
 - Build freetype2 as shared library.
 - Update Python version to 2.7.14
-- Add Python3 in version 3.5.5 to SDK
 - Add ccache to Ubuntu Dockerfile to utilize build cache on TravisCI.
 - Pin Docker image to a stable and more recent base image
   (docker.io/ubuntu:xenial-20180417).

diff --git a/README-WIN32.txt b/README-WIN32.txt
@@ -67,4 +67,5 @@ Dependency Versions Included:
 * libpng 1.6.34       <http://www.libpng.org/pub/png/libpng.html>
 * zlib 1.2.11         <http://www.zlib.net/>
 * Python 2.7.14       <https://www.python.org/>
+* Python 3.5.7        <https://www.python.org/>
 * SDL 2.0.8           <https://www.libsdl.org/>
diff --git a/Sources.cmake b/Sources.cmake
@@ -30,9 +30,9 @@ set(PYTHON_VERSION 2.7.14)
 set(PYTHON_URL https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz)
 set(PYTHON_MD5 cee2e4b33ad3750da77b2e85f2f8b724)
 
-set(PYTHON3_VERSION 3.5.5)
+set(PYTHON3_VERSION 3.5.7)
 set(PYTHON3_URL https://www.python.org/ftp/python/${PYTHON3_VERSION}/Python-${PYTHON3_VERSION}.tgz)
-set(PYTHON3_MD5 7c825b747d25c11e669e99b912398585)
+set(PYTHON3_MD5 92f4c16c55429bf986f5ab45fe3a6659)
 
 set(FREETYPE_VERSION 2.9)
 set(FREETYPE_URL http://downloads.sourceforge.net/project/freetype/freetype2/${FREETYPE_VERSION}/freetype-${FREETYPE_VERSION}.tar.gz)

diff --git a/boost-config.jam.in b/boost-config.jam.in
@@ -1,6 +1,6 @@
 using python
     : @PYTHON_VERSION@  # version
-    : @PYTHON_INSTALL_DIR@/bin/python@PYTHON3_VERSION@  # cmd-or-prefix
+    : @PYTHON_INSTALL_DIR@/bin/python@PYTHON_VERSION@  # cmd-or-prefix
     : @PYTHON_INSTALL_DIR@/include/python@PYTHON_VERSION@ # includes
     : @PYTHON_INSTALL_DIR@/lib # libraries
     ;