From 5fcb5b2627ef520b83f1ce88dce326bf3f199b54 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 4 Sep 2022 09:35:03 -0400 Subject: [PATCH] gnuradio: fix build when XBPS_WORDSIZE != XBPS_TARGET_WORDSIZE --- srcpkgs/gnuradio/template | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index bfd2a8e3512..4b74134fa7c 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,16 +1,15 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.3.0 -revision=2 +revision=3 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax -DZEROMQ_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include - -Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11" + -Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" _pydeps="python3-Mako python3-cairo python3-click python3-click-plugins python3-gobject python3-jsonschema python3-numpy python3-pyqtgraph python3-pyzmq python3-scipy python3-yaml" -hostmakedepends="pkg-config doxygen mathjax python3-Sphinx python3-pybind11 python3-pygccxml - ${_pydeps}" +hostmakedepends="pkg-config doxygen mathjax python3-Sphinx python3-pygccxml ${_pydeps}" makedepends="SDL-devel SoapySDR-devel boost-devel codec2-devel cppzmq fftw-devel gmpxx-devel gsl-devel gtk+3-devel jack-devel libgsm-devel libiio-devel libsndfile-devel mpir-devel python3-devel python3-gobject-devel python3-pybind11 python3-pygccxml qwt-devel spdlog @@ -34,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" fi -if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then - nocross="pybind11: Python config failure: Python is 64-bit, chosen compiler is 32-bit" -fi - if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973 fi