forked from pool/python3-pyside2
Fabian Vogt
4b8753715e
- Update to version 5.12 - Package examples - Include PEP484 type hints - Use parallel make - Rebase lib64.patch - Drop fix_build.patch, obsoleted by upstream changes - Add 0001-Avoid-creation-of-empty-build-directories-in-install.patch - Add 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch OBS-URL: https://build.opensuse.org/request/show/660882 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=20
87 lines
4.2 KiB
Diff
87 lines
4.2 KiB
Diff
From f041ed5f4a3960cebf65c963b50d2c5490cd8b2a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Thu, 20 Dec 2018 19:05:03 +0100
|
|
Subject: [PATCH] Lookup clang library and install in arch specific library
|
|
path
|
|
|
|
---
|
|
build_scripts/platforms/unix.py | 4 ++--
|
|
sources/pyside2/CMakeLists.txt | 2 +-
|
|
.../shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 2 +-
|
|
sources/shiboken2/CMakeLists.txt | 4 ++--
|
|
4 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
|
|
index d3767976..63019a0a 100644
|
|
--- a/build_scripts/platforms/unix.py
|
|
+++ b/build_scripts/platforms/unix.py
|
|
@@ -80,7 +80,7 @@ def prepare_packages_posix(self, vars):
|
|
|
|
# <install>/lib/lib* -> {st_package_name}/
|
|
copydir(
|
|
- "{install_dir}/lib/",
|
|
+ "{install_dir}/lib64/",
|
|
"{st_build_dir}/{st_package_name}",
|
|
filter=[
|
|
adjusted_lib_name("libshiboken*",
|
|
@@ -155,7 +155,7 @@ def prepare_packages_posix(self, vars):
|
|
|
|
# <install>/lib/lib* -> {st_package_name}/
|
|
copydir(
|
|
- "{install_dir}/lib/",
|
|
+ "{install_dir}/lib64/",
|
|
"{st_build_dir}/{st_package_name}",
|
|
filter=[
|
|
adjusted_lib_name("libpyside*",
|
|
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
|
|
index 1d563fb4..7b8d8b85 100644
|
|
--- a/sources/pyside2/CMakeLists.txt
|
|
+++ b/sources/pyside2/CMakeLists.txt
|
|
@@ -187,7 +187,7 @@ endif()
|
|
|
|
option(BUILD_TESTS "Build tests." TRUE)
|
|
option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
|
|
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
|
|
if(CMAKE_HOST_APPLE)
|
|
set(ALTERNATIVE_QT_INCLUDE_DIR "" CACHE PATH "Deprecated. CMake now finds the proper include dir itself.")
|
|
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
|
|
index 619c0f08..ab1dceff 100644
|
|
--- a/sources/shiboken2/CMakeLists.txt
|
|
+++ b/sources/shiboken2/CMakeLists.txt
|
|
@@ -124,7 +124,8 @@ if(MSVC)
|
|
set(CLANG_LIB_NAMES libclang)
|
|
endif()
|
|
|
|
-find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib)
|
|
+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
+find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib${LIB_SUFFIX})
|
|
if (NOT EXISTS ${CLANG_LIBRARY})
|
|
string(REPLACE ";" ", " CLANG_LIB_NAMES_STRING "${CLANG_LIB_NAMES}")
|
|
message(FATAL_ERROR "Unable to find the Clang library in ${CLANG_DIR}.\
|
|
@@ -333,7 +334,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
|
|
set(CMAKE_CXX_STANDARD 11)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
|
|
|
|
if (WIN32)
|
|
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
index d3d5c8da..acb1efd9 100644
|
|
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
@@ -243,7 +243,7 @@ static QString findClangLibDir()
|
|
{
|
|
for (const char *envVar : {"LLVM_INSTALL_DIR", "CLANG_INSTALL_DIR"}) {
|
|
if (qEnvironmentVariableIsSet(envVar)) {
|
|
- const QString path = QFile::decodeName(qgetenv(envVar)) + QLatin1String("/lib");
|
|
+ const QString path = QFile::decodeName(qgetenv(envVar)) + QLatin1String("/lib64");
|
|
if (QFileInfo::exists(path))
|
|
return path;
|
|
}
|
|
--
|
|
2.19.2
|
|
|