File lib64.patch of Package python3-pyside2

Overview Repositories Revisions Requests Users Attributes Meta

File lib64.patch of Package python3-pyside2 (Revision beea6e361cd703180cf58c4552e68a70)

Currently displaying revision beea6e361cd703180cf58c4552e68a70 , Show latest

From d494a8eb0653b6e22207c48da7808a0bbd86b569 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                              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 60722cd..c9df7f9 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -81,7 +81,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*",
@@ -139,7 +139,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 bab97f4..26fa266 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -98,7 +98,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 "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/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index dac5110..4b091eb 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;
         }
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
index 5877971..25a53b3 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
@@ -121,7 +121,7 @@ else()
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-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 "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install \
     prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
 set(BIN_INSTALL_DIR "bin" CACHE PATH "The subdirectory relative to the install prefix where \
-- 
2.26.2

Places

File lib64.patch of Package python3-pyside2 (Revision beea6e361cd703180cf58c4552e68a70)

Places