pool/python3-pyside2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=5
This commit is contained in:
Adrian Schröter 2018-05-25 06:42:45 +00:00 committed by Git OBS Bridge
parent 06fd6f2074
commit f922b3c2bc
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib64.patch
View File

@ -1,17 +1,18 @@
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
index 0a2920e4..5486e3ae 100644
index 0a2920e4..b9388182 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
@@ -104,7 +104,7 @@ if(MSVC)
@@ -104,7 +104,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}.\
@@ -114,7 +114,7 @@ endif()
@@ -114,7 +115,7 @@ endif()
message(STATUS "CLANG: ${CLANG_DIR}, ${CLANG_LIBRARY} detected by ${CLANG_DIR_SOURCE}")
# Find highest version clang builtin includes folder to pass along to shiboken.
@ -20,3 +21,11 @@ index 0a2920e4..5486e3ae 100644
file(GLOB CLANG_BUILTIN_INCLUDES_DIR_CANDIDATES "${CLANG_BUILTIN_INCLUDES_DIR_PREFIX}/*")
# Collect only directories, and not files, and only directories starting with a number.
@@ -303,7 +304,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)

9
python3-pyside2.spec
View File

@ -28,7 +28,7 @@ Release: 0
Summary: PySide - python bindings for Qt
License: LGPL-2.1-or-later
Group: Development/Languages/Python
Url: http://qt-project.org/wiki/PySide
Url: http://wiki.qt.io/Qt_for_Python
Source0: pyside-setup-%{version}.tar.xz
Patch1: fix-cmake.patch
Patch2: lib64.patch
@ -86,8 +86,8 @@ BuildRequires: pkgconfig(Qt5XmlPatterns)
#BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: libxslt-devel
BuildRequires: llvm-clang-devel >= 3.9
BuildRequires: llvm-devel >= 3.9
BuildRequires: clang-devel >= 3.9
#BuildRequires: llvm-devel >= 3.9
BuildRequires: python-devel >= 2.6
BuildRequires: python-setuptools
@ -107,9 +107,12 @@ for Qt.
%prep
%setup -q -n pyside-setup-%{version}
%patch1 -p1
%if "%{_libdir}" == "/usr/lib64"
%patch2 -p1
%endif
%build
export LLVM_INSTALL_DIR=/usr
export CFLAGS=-I/usr/include/linux
%mypython setup.py build --reuse-build --ignore-git \
%if %{with tests}