From ae562b784143f4a5c0a410d06cb38f7936301969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Fri, 4 Sep 2020 22:23:57 -0700
Subject: [python3] Fix installation on OpenSUSE (#13274)

---
 ports/python3/CONTROL        |  2 +-
 ports/python3/portfile.cmake | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'ports/python3')

diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL
index 2df8d9472..aecb34d98 100644
--- a/ports/python3/CONTROL
+++ b/ports/python3/CONTROL
@@ -1,6 +1,6 @@
 Source: python3
 Version: 3.8.3
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/python/cpython
 Description: The Python programming language as an embeddable library
 Build-Depends: libffi, openssl, zlib (!uwp&!windows)
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index c680aeb2e..087e59a03 100644
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@@ -161,17 +161,16 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 		)
 
 		message(STATUS "Installing ${TARGET_TRIPLET}-rel lib files...")
-		file(GLOB LIBS
+		file(GLOB PY_LIBS
 			${OUT_PATH_RELEASE}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/*)
-		file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/Lib
+		file(INSTALL ${PY_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/Lib
 			PATTERN "*.pyc" EXCLUDE
 			PATTERN "*__pycache__*" EXCLUDE
 		)
 
 		message(STATUS "Installing ${TARGET_TRIPLET}-rel share files...")
-		file(GLOB LIBS
-			${OUT_PATH_RELEASE}/lib/pkgconfig/*)
-		file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}
+		file(GLOB PKGCFG ${OUT_PATH_RELEASE}/lib/pkgconfig/*)
+		file(INSTALL ${PKGCFG} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}
 			PATTERN "*.pyc" EXCLUDE
 			PATTERN "*__pycache__*" EXCLUDE
 		)
@@ -179,6 +178,9 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 		message(STATUS "Installing ${TARGET_TRIPLET}-rel Python library files...")
 		file(GLOB LIBS
 			${OUT_PATH_RELEASE}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.*)
+        if (NOT LIBS)
+            file(GLOB LIBS ${OUT_PATH_RELEASE}/lib64/*)
+        endif()
 		file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib
 			PATTERN "*.pyc" EXCLUDE
 			PATTERN "*__pycache__*" EXCLUDE
@@ -233,6 +235,10 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 		message(STATUS "Installing ${TARGET_TRIPLET}-dbg Python library files...")
 		file(GLOB LIBS
 			${OUT_PATH_DEBUG}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}d.*)
+        if (NOT LIBS)
+            file(GLOB LIBS
+                ${OUT_PATH_DEBUG}/lib64/*)
+        endif()
 		file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
 			PATTERN "*.pyc" EXCLUDE
 			PATTERN "*__pycache__*" EXCLUDE
-- 
cgit v1.2.3