diff options
| author | evorster | 2020-06-23 14:01:44 +0200 |
|---|---|---|
| committer | evorster | 2020-06-23 14:01:44 +0200 |
| commit | d3ad0288faa6966d71e831b040f3e2c34ed1641e (patch) | |
| tree | 63488e264723f9ec581cabdae5f462521ac95238 | |
| parent | 6c077fdfa32e26f4723a0c72c556c0f58e08a115 (diff) | |
| download | aur-d3ad0288faa6966d71e831b040f3e2c34ed1641e.tar.gz | |
Re-did the boost python versions detection
| -rw-r--r-- | Boost_lib_detection.patch | 15 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | python3_compile.patch | 11 |
3 files changed, 23 insertions, 13 deletions
diff --git a/Boost_lib_detection.patch b/Boost_lib_detection.patch new file mode 100644 index 000000000000..4a42c50b2eba --- /dev/null +++ b/Boost_lib_detection.patch @@ -0,0 +1,15 @@ +--- src/Vega-Strike-Engine-Source/engine/CMakeLists.txt.orig 2020-06-23 13:28:02.931169600 +0200 ++++ src/Vega-Strike-Engine-Source/engine/CMakeLists.txt 2020-06-23 13:26:33.149153133 +0200 +@@ -720,10 +720,10 @@ + UNSET(Boost_python_FOUND CACHE) + IF (USE_PYTHON_3) + MESSAGE("++ Looking for System Boost::python3") +- FIND_PACKAGE(Boost COMPONENTS python3 log log_setup REQUIRED) ++ FIND_PACKAGE(Boost COMPONENTS python38 log log_setup REQUIRED) + ELSE (USE_PYTHON_3) + MESSAGE("++ Looking for System Boost::python (py2)") +- FIND_PACKAGE(Boost COMPONENTS python log log_setup REQUIRED) ++ FIND_PACKAGE(Boost COMPONENTS python27 log log_setup REQUIRED) + ENDIF (USE_PYTHON_3) + + IF (Boost_FOUND) @@ -23,8 +23,14 @@ pkgver() { } prepare(){ +cd "${srcdir}"/Vega-Strike-Engine-Source +git revert --no-commit 04f99ab64535fc0146a90ac9e226d71cbbac0095 +#git revert -m 2 --no-commit 59deb3002e69a9f443d6d7ba1bb61c31f898fa7f +cd .. +pwd + mkdir -p build -patch -Np1 -i ../python3_compile.patch +patch -Np1 -i ../Boost_lib_detection.patch patch -Np1 -i ../vegastrike_install.patch patch -Np1 -i ../vegasettings_install.patch patch -Np1 -i ../mesh_tool_install.patch @@ -36,7 +42,7 @@ build(){ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_PIE=ON \ - -DUSE_PYTHON_3=ON + -DUSE_PYTHON_3=ON make } diff --git a/python3_compile.patch b/python3_compile.patch deleted file mode 100644 index 7ddf30236c7e..000000000000 --- a/python3_compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Vega-Strike-Engine-Source/engine/CMakeLists.txt_backup 2020-06-15 18:54:51.819058797 +0200 -+++ src/Vega-Strike-Engine-Source/engine/CMakeLists.txt 2020-06-15 18:55:43.456681085 +0200 -@@ -720,7 +720,7 @@ - UNSET(Boost_python_FOUND CACHE) - IF (USE_PYTHON_3) - MESSAGE("++ Looking for System Boost::python3") -- FIND_PACKAGE(Boost COMPONENTS python3 log log_setup REQUIRED) -+ FIND_PACKAGE(Boost COMPONENTS python log log_setup REQUIRED) - ELSE (USE_PYTHON_3) - MESSAGE("++ Looking for System Boost::python (py2)") - FIND_PACKAGE(Boost COMPONENTS python log log_setup REQUIRED) |