Ana Guerrero 2024-09-08 09:59:46 +00:00 committed by Git OBS Bridge
commit 10314f6b4f
2 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 5 19:17:03 UTC 2024 - Ben Greiner <code@bnavigator.de>
- Tumbleweed now has numpy2: Fix include path
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 19 07:48:28 UTC 2024 - Christophe Marin <christophe@krop.fr> Wed Jun 19 07:48:28 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -181,6 +181,9 @@ sed -i 's#purelib#platlib#' sources/shiboken6/cmake/ShibokenHelpers.cmake
pushd sources/%{pyside_flavor} pushd sources/%{pyside_flavor}
# numpy changed the include path on 2.0
numpyinc=$(%{__mypython} -c 'import numpy; print(numpy.get_include())')
# NOTE:The compiler and linker flags shall not be defined # NOTE:The compiler and linker flags shall not be defined
%cmake_qt6 \ %cmake_qt6 \
-DBUILD_TESTS:BOOL=ON \ -DBUILD_TESTS:BOOL=ON \
@ -189,7 +192,7 @@ pushd sources/%{pyside_flavor}
-DCMAKE_CXX_FLAGS:STRING="" \ -DCMAKE_CXX_FLAGS:STRING="" \
-DCMAKE_EXE_LINKER_FLAGS:STRING="" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="" \
-DPython_EXECUTABLE:STRING=%{__mypython} \ -DPython_EXECUTABLE:STRING=%{__mypython} \
-DNUMPY_INCLUDE_DIR:STRING=%{mypython_sitearch}/numpy/core/include \ -DNUMPY_INCLUDE_DIR:STRING=${numpyinc} \
-DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \ -DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \
%if "%{pyside_flavor}" == "shiboken6" %if "%{pyside_flavor}" == "shiboken6"
-DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_SKIP_RPATH:BOOL=ON \