commit 92af3046686e0e1152bedb6ce6f3d8681df9e5fa
Author: Jan Palus <[email protected]>
Date: Mon Aug 29 18:15:02 2022 +0200
extend sip patch with possibility to pass sip-build options and set qmake
path explicitly
plplot-sip-build-support.patch | 2 +-
plplot.spec | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index 9748d7c..f853aa5 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -96,7 +96,7 @@ BuildRequires: qhull-devel >= 2011.1
BuildRequires: qt5-build >= 4
BuildRequires: qt5-qmake >= 4
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.742
+BuildRequires: rpmbuild(macros) >= 2.016
BuildRequires: sed >= 4.0
BuildRequires: sip
BuildRequires: swig
@@ -700,6 +700,7 @@ cd build
-DPLD_pdf=ON \
%{?with_plmeta:-DPLD_plmeta=ON} \
-DPLD_pstex=ON \
+ -DSIPBUILD_OPTIONS:LIST="--qmake;%{_qt5_qmake}" \
-DUSE_INCRTCL_VERSION_4=ON \
-DUSE_RPATH=OFF \
%if %{with itcl}
diff --git a/plplot-sip-build-support.patch b/plplot-sip-build-support.patch
index 98350af..bcd5e72 100644
--- a/plplot-sip-build-support.patch
+++ b/plplot-sip-build-support.patch
@@ -21,7 +21,7 @@ Last-Update: 2021-06-18
+ configure_file(pyproject.toml pyproject.toml COPYONLY)
+ add_custom_command(
+ OUTPUT ${plplot_pyqt5_HDR} ${plplot_pyqt5_SRC}
-+ COMMAND ${SIPBUILD_EXECUTABLE} --no-make
++ COMMAND ${SIPBUILD_EXECUTABLE} --no-make ${SIPBUILD_OPTIONS}
+ )
+ set(FILES_TO_COPY ${plplot_pyqt5_HDR} ${plplot_pyqt5_SRC})
+ list(TRANSFORM FILES_TO_COPY REPLACE .*/ build/plplot_pyqt5/)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/plplot.git/commitdiff/92af3046686e0e1152bedb6ce6f3d8681df9e5fa
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
