diff options
| author |   Ryan Volz <ryan.volz@gmail.com> | 2023-11-07 12:09:29 -0500 |
|---|---|---|
| committer |   Jeff Long <willcode4@gmail.com> | 2023-12-10 09:15:53 -0500 |
| commit | 1a427ef718318c9d33c0eee9e61c9d512041c6df (patch) | |
| tree | e3c231ff94ed4c3b3ca79b656d219fed37bcf964 | |
| parent | modtool: template: Update conda recipe. (diff) | |
| download | gnuradio-1a427ef718318c9d33c0eee9e61c9d512041c6df.tar.xz gnuradio-1a427ef718318c9d33c0eee9e61c9d512041c6df.zip | |
ci: conda: Clean up recipe and update for latest boost packages.
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
(cherry picked from commit df4e603cf55702d0c0437b7fa4941089afe0d20e)
Signed-off-by: Jeff Long <willcode4@gmail.com>
| -rw-r--r-- | .conda-forge.yml | 1 | ||||
| -rw-r--r-- | .packaging/conda_recipe/bld.bat | 10 | ||||
| -rw-r--r-- | .packaging/conda_recipe/meta.yaml | 17 | ||||
| -rw-r--r-- | .packaging/conda_recipe/yum_requirements.txt | 18 |
4 files changed, 8 insertions, 38 deletions
diff --git a/.conda-forge.yml b/.conda-forge.yml index b82289580..1b8d6101a 100644 --- a/.conda-forge.yml +++ b/.conda-forge.yml @@ -32,6 +32,7 @@ clone_depth: 0 github_actions: + cancel_in_progress: false store_build_artifacts: true os_version: linux_64: cos7 diff --git a/.packaging/conda_recipe/bld.bat b/.packaging/conda_recipe/bld.bat index 40c4d0583..b02bbe89e 100644 --- a/.packaging/conda_recipe/bld.bat +++ b/.packaging/conda_recipe/bld.bat @@ -9,11 +9,11 @@ if errorlevel 1 exit 1 :: configure cmake -G "Ninja" ^ - -DCMAKE_BUILD_TYPE:STRING=Release ^ - -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ - -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ - -DPYTHON_EXECUTABLE:PATH="%PYTHON%" ^ - -DGR_PYTHON_DIR:PATH="%SP_DIR%" ^ + -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^ + -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^ + -DPYTHON_EXECUTABLE="%PYTHON%" ^ + -DGR_PYTHON_DIR="%SP_DIR%" ^ .. if errorlevel 1 exit 1 diff --git a/.packaging/conda_recipe/meta.yaml b/.packaging/conda_recipe/meta.yaml index 2eb007edc..f97e40c5c 100644 --- a/.packaging/conda_recipe/meta.yaml +++ b/.packaging/conda_recipe/meta.yaml @@ -18,7 +18,7 @@ source: build: number: 0 - skip: true # [py!=310] + skip: true # [py!=311] entry_points: - gnuradio-companion = gnuradio.grc.main:main # [win] - gr_filter_design = gnuradio.filter.filter_design:main # [win] @@ -44,28 +44,16 @@ requirements: - pybind11 # [build_platform != target_platform] - numpy # [build_platform != target_platform] # below are needed to link with Qt for qtgui - - {{ cdt('libice') }} # [linux] - - {{ cdt('libselinux') }} # [linux] - - {{ cdt('libsm') }} # [linux] - - {{ cdt('libx11') }} # [linux] - - {{ cdt('libxau') }} # [linux] - - {{ cdt('libxcb') }} # [linux] - - {{ cdt('libxdamage') }} # [linux] - - {{ cdt('libxext') }} # [linux] - - {{ cdt('libxfixes') }} # [linux] - - {{ cdt('libxrender') }} # [linux] - - {{ cdt('libxxf86vm') }} # [linux] - - {{ cdt('libuuid') }} # [linux] - {{ cdt('mesa-dri-drivers') }} # [linux] - {{ cdt('mesa-libgl-devel') }} # [linux] host: - - boost-cpp - click - click-plugins - codec2 - fftw - gmp # [not win] - gsl + - libboost-devel - libsndfile - libthrift # [not win] - mako @@ -110,7 +98,6 @@ requirements: - pyzmq run: - alsa-plugins # [linux] - - boost-cpp - click - click-plugins - fftw diff --git a/.packaging/conda_recipe/yum_requirements.txt b/.packaging/conda_recipe/yum_requirements.txt index ceb805b02..d72433568 100644 --- a/.packaging/conda_recipe/yum_requirements.txt +++ b/.packaging/conda_recipe/yum_requirements.txt @@ -1,21 +1,3 @@ mesa-libGL mesa-dri-drivers -libice -libselinux -libsm -libX11 -libXcomposite -libXcursor -libXdamage -libXext -libXfixes -libXi -libXinerama -libXrandr -libXxf86vm -xcb-util -xcb-util-image -xcb-util-keysyms -xcb-util-renderutil -xcb-util-wm xorg-x11-server-Xvfb |