Attachment 230843 Details for Bug 261060 – fix plist when PYTHON_VERSION != 3.8

[patch] fix plist when PYTHON_VERSION != 3.8

patch-comms_gnuradio.diff (text/plain), 3.72 KB, created by Eric Camachat on 2022-01-09 13:56:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2022-01-09 13:56:38 UTC

Size: 3.72 KB

patch

obsolete

>diff --git comms/gnuradio/Makefile comms/gnuradio/Makefile
>index 22967aa40534..5d027bd7b3b9 100644
>--- comms/gnuradio/Makefile
>+++ comms/gnuradio/Makefile
>@@ -82,7 +82,7 @@ OPTIONS_SUB=		yes
> UHD_DESC=	Include UHD support from Ettus
> TESTING_DESC=	Include testing support
> 
>-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
>+PLIST_SUB+=	PORTVERSION=${PORTVERSION} PORTMAINVER=${PORTVERSION:C|^([1-9]+)\.([0-9]+)\.([0-9]+).*|\1.\2.\3|}
> 
> DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
> 			${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
>diff --git comms/gnuradio/pkg-plist comms/gnuradio/pkg-plist
>index a8cd105b792b..f4c7536ae506 100644
>--- comms/gnuradio/pkg-plist
>+++ comms/gnuradio/pkg-plist
>@@ -854,58 +854,58 @@ lib/cmake/gnuradio/gnuradio-zeromqTargets.cmake
> lib/cmake/gnuradio/runtime_swigTargets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/gnuradio/runtime_swigTargets.cmake
> lib/libgnuradio-analog.so
>-lib/libgnuradio-analog.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-analog.so.%%PORTMAINVER%%
> lib/libgnuradio-analog.so.%%PORTVERSION%%
> lib/libgnuradio-audio.so
>-lib/libgnuradio-audio.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-audio.so.%%PORTMAINVER%%
> lib/libgnuradio-audio.so.%%PORTVERSION%%
> lib/libgnuradio-blocks.so
>-lib/libgnuradio-blocks.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-blocks.so.%%PORTMAINVER%%
> lib/libgnuradio-blocks.so.%%PORTVERSION%%
> lib/libgnuradio-channels.so
>-lib/libgnuradio-channels.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-channels.so.%%PORTMAINVER%%
> lib/libgnuradio-channels.so.%%PORTVERSION%%
> lib/libgnuradio-digital.so
>-lib/libgnuradio-digital.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-digital.so.%%PORTMAINVER%%
> lib/libgnuradio-digital.so.%%PORTVERSION%%
> lib/libgnuradio-dtv.so
>-lib/libgnuradio-dtv.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-dtv.so.%%PORTMAINVER%%
> lib/libgnuradio-dtv.so.%%PORTVERSION%%
> lib/libgnuradio-fec.so
>-lib/libgnuradio-fec.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-fec.so.%%PORTMAINVER%%
> lib/libgnuradio-fec.so.%%PORTVERSION%%
> lib/libgnuradio-fft.so
>-lib/libgnuradio-fft.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-fft.so.%%PORTMAINVER%%
> lib/libgnuradio-fft.so.%%PORTVERSION%%
> lib/libgnuradio-filter.so
>-lib/libgnuradio-filter.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-filter.so.%%PORTMAINVER%%
> lib/libgnuradio-filter.so.%%PORTVERSION%%
> lib/libgnuradio-pmt.so
>-lib/libgnuradio-pmt.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-pmt.so.%%PORTMAINVER%%
> lib/libgnuradio-pmt.so.%%PORTVERSION%%
> lib/libgnuradio-qtgui.so
>-lib/libgnuradio-qtgui.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-qtgui.so.%%PORTMAINVER%%
> lib/libgnuradio-qtgui.so.%%PORTVERSION%%
> lib/libgnuradio-runtime.so
>-lib/libgnuradio-runtime.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-runtime.so.%%PORTMAINVER%%
> lib/libgnuradio-runtime.so.%%PORTVERSION%%
> lib/libgnuradio-trellis.so
>-lib/libgnuradio-trellis.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-trellis.so.%%PORTMAINVER%%
> lib/libgnuradio-trellis.so.%%PORTVERSION%%
> %%UHD%%lib/libgnuradio-uhd.so
>-%%UHD%%lib/libgnuradio-uhd.so.%%PYTHON_VER%%.4
>+%%UHD%%lib/libgnuradio-uhd.so.%%PORTMAINVER%%
> %%UHD%%lib/libgnuradio-uhd.so.%%PORTVERSION%%
> lib/libgnuradio-video-sdl.so
>-lib/libgnuradio-video-sdl.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-video-sdl.so.%%PORTMAINVER%%
> lib/libgnuradio-video-sdl.so.%%PORTVERSION%%
> lib/libgnuradio-vocoder.so
>-lib/libgnuradio-vocoder.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-vocoder.so.%%PORTMAINVER%%
> lib/libgnuradio-vocoder.so.%%PORTVERSION%%
> lib/libgnuradio-wavelet.so
>-lib/libgnuradio-wavelet.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-wavelet.so.%%PORTMAINVER%%
> lib/libgnuradio-wavelet.so.%%PORTVERSION%%
> lib/libgnuradio-zeromq.so
>-lib/libgnuradio-zeromq.so.%%PYTHON_VER%%.4
>+lib/libgnuradio-zeromq.so.%%PORTMAINVER%%
> lib/libgnuradio-zeromq.so.%%PORTVERSION%%
> %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
> %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc

Actions: View | Diff

Attachments on bug 261060: 230843