Skip to content

Commit df4e603

Browse files
ryanvolzwillcode
authored andcommittedNov 9, 2023
ci: conda: Clean up recipe and update for latest boost packages.
Signed-off-by: Ryan Volz <[email protected]>
1 parent f7bcf73 commit df4e603

File tree

4 files changed

+8
-38
lines changed

4 files changed

+8
-38
lines changed
 

‎.conda-forge.yml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
clone_depth: 0
3434
github_actions:
35+
cancel_in_progress: false
3536
store_build_artifacts: true
3637
os_version:
3738
linux_64: cos7

‎.packaging/conda_recipe/bld.bat

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ if errorlevel 1 exit 1
99

1010
:: configure
1111
cmake -G "Ninja" ^
12-
-DCMAKE_BUILD_TYPE:STRING=Release ^
13-
-DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^
14-
-DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^
15-
-DPYTHON_EXECUTABLE:PATH="%PYTHON%" ^
16-
-DGR_PYTHON_DIR:PATH="%SP_DIR%" ^
12+
-DCMAKE_BUILD_TYPE=Release ^
13+
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
14+
-DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
15+
-DPYTHON_EXECUTABLE="%PYTHON%" ^
16+
-DGR_PYTHON_DIR="%SP_DIR%" ^
1717
..
1818
if errorlevel 1 exit 1
1919

‎.packaging/conda_recipe/meta.yaml

+2-15
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ source:
1818

1919
build:
2020
number: 0
21-
skip: true # [py!=310]
21+
skip: true # [py!=311]
2222
entry_points:
2323
- gnuradio-companion = gnuradio.grc.main:main # [win]
2424
- gr_filter_design = gnuradio.filter.filter_design:main # [win]
@@ -44,28 +44,16 @@ requirements:
4444
- pybind11 # [build_platform != target_platform]
4545
- numpy # [build_platform != target_platform]
4646
# below are needed to link with Qt for qtgui
47-
- {{ cdt('libice') }} # [linux]
48-
- {{ cdt('libselinux') }} # [linux]
49-
- {{ cdt('libsm') }} # [linux]
50-
- {{ cdt('libx11') }} # [linux]
51-
- {{ cdt('libxau') }} # [linux]
52-
- {{ cdt('libxcb') }} # [linux]
53-
- {{ cdt('libxdamage') }} # [linux]
54-
- {{ cdt('libxext') }} # [linux]
55-
- {{ cdt('libxfixes') }} # [linux]
56-
- {{ cdt('libxrender') }} # [linux]
57-
- {{ cdt('libxxf86vm') }} # [linux]
58-
- {{ cdt('libuuid') }} # [linux]
5947
- {{ cdt('mesa-dri-drivers') }} # [linux]
6048
- {{ cdt('mesa-libgl-devel') }} # [linux]
6149
host:
62-
- boost-cpp
6350
- click
6451
- click-plugins
6552
- codec2
6653
- fftw
6754
- gmp # [not win]
6855
- gsl
56+
- libboost-devel
6957
- libsndfile
7058
- libthrift # [not win]
7159
- mako
@@ -110,7 +98,6 @@ requirements:
11098
- pyzmq
11199
run:
112100
- alsa-plugins # [linux]
113-
- boost-cpp
114101
- click
115102
- click-plugins
116103
- fftw
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
11
mesa-libGL
22
mesa-dri-drivers
3-
libice
4-
libselinux
5-
libsm
6-
libX11
7-
libXcomposite
8-
libXcursor
9-
libXdamage
10-
libXext
11-
libXfixes
12-
libXi
13-
libXinerama
14-
libXrandr
15-
libXxf86vm
16-
xcb-util
17-
xcb-util-image
18-
xcb-util-keysyms
19-
xcb-util-renderutil
20-
xcb-util-wm
213
xorg-x11-server-Xvfb

0 commit comments

Comments
 (0)
Please sign in to comment.