Thu Aug 20 01:52:38 2020 UTC ()
gr-osmosdr: partial merge for -wip to fix pbulk scan failure

XXX: Package may currently not build. Will be solved by fully merging from
wip after gnuradio update.


(tnn)
diff -r1.24 -r1.25 pkgsrc/ham/gr-osmosdr/Makefile
cvs diff -r1.24 -r1.25 pkgsrc/ham/gr-osmosdr/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gr-osmosdr/Makefile 2020/05/06 14:04:43 1.24
+++ pkgsrc/ham/gr-osmosdr/Makefile 2020/08/20 01:52:38 1.25
@@ -1,52 +1,55 @@ @@ -1,52 +1,55 @@
1# $NetBSD: Makefile,v 1.24 2020/05/06 14:04:43 adam Exp $ 1# $NetBSD: Makefile,v 1.25 2020/08/20 01:52:38 tnn Exp $
2 2
3DISTNAME= gr-osmosdr-0.1.4 3DISTNAME= gr-osmosdr-0.1.4
4PKGREVISION= 17 4PKGREVISION= 18
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES+= http://git.osmocom.org/gr-osmosdr/snapshot/ 6MASTER_SITES+= http://git.osmocom.org/gr-osmosdr/snapshot/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://git.osmocom.org/gr-osmosdr 9HOMEPAGE= https://git.osmocom.org/gr-osmosdr
10COMMENT= SDR Hardware support for OsmoSDR and so many more 10COMMENT= SDR Hardware support for OsmoSDR and so many more
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_TOOLS= cmake 14USE_TOOLS= cmake
15USE_CMAKE= yes 15USE_CMAKE= yes
16 16
17# Suppress warning for developer 17# Suppress warning for developer
18CMAKE_ARGS+= -Wno-dev 18CMAKE_ARGS+= -Wno-dev
19# -- * Ettus USRP Devices 19# -- * Ettus USRP Devices
20CMAKE_ARGS+= -DGNURADIO_UHD_INCLUDE_DIRS=${PREFIX}/include/uhd 20CMAKE_ARGS+= -DGNURADIO_UHD_INCLUDE_DIRS=${PREFIX}/include/uhd
21CMAKE_ARGS+= -DGNURADIO_BLOCKS_INCLUDE_DIRS=${PREFIX}/include 21CMAKE_ARGS+= -DGNURADIO_BLOCKS_INCLUDE_DIRS=${PREFIX}/include
 22# TODO: make it PKG_OPTION
 23CMAKE_ARGS+= -DENABLE_DOXYGEN=OFF
22 24
23PLIST_SUBST+= PYSITELIB=${PYSITELIB} 25PLIST_SUBST+= PYSITELIB=${PYSITELIB}
24 26
25# Python 36 and 37 result in build errors; 27 builds ok. 27# Python 36 and 37 result in build errors; 27 builds ok.
26PYTHON_VERSIONS_ACCEPTED= 27 28PYTHON_VERSIONS_ACCEPTED= 27
27REPLACE_PYTHON+= apps/osmocom_siggen_base.py 29REPLACE_PYTHON+= apps/osmocom_siggen_base.py
28 30
29.include "../../devel/boost-headers/buildlink3.mk" 31.include "../../devel/boost-headers/buildlink3.mk"
30.include "../../devel/boost-libs/buildlink3.mk" 32.include "../../devel/boost-libs/buildlink3.mk"
31.include "../../devel/libusb1/buildlink3.mk" 33.include "../../devel/libusb1/buildlink3.mk"
32.include "../../devel/orc/buildlink3.mk" 34.include "../../devel/orc/buildlink3.mk"
33 35
34# \todo Clearly threre is some ordering scheme. Explain it. 36# \todo Clearly threre is some ordering scheme. Explain it.
35 37
36.include "../../ham/uhd/buildlink3.mk" 38.include "../../ham/uhd/buildlink3.mk"
37.include "../../lang/python/application.mk" 39.include "../../lang/python/application.mk"
38.include "../../lang/python/extension.mk" 40.include "../../lang/python/extension.mk"
39 41
40.include "../../ham/rtl-sdr/buildlink3.mk" 42.include "../../ham/rtl-sdr/buildlink3.mk"
41.include "../../ham/libmirisdr/buildlink3.mk" 43.include "../../ham/libmirisdr/buildlink3.mk"
42.include "../../ham/osmo-sdr/buildlink3.mk" 44.include "../../ham/osmo-sdr/buildlink3.mk"
43# \todo Re-enable gr-fcdproplus when it works, or optionize it. 45# \todo Re-enable gr-fcdproplus when it works, or optionize it.
44# gr-fcdproplus does not build at the moment 46# gr-fcdproplus does not build at the moment
45#.include "../../ham/gr-fcdproplus/buildlink3.mk" 47#.include "../../ham/gr-fcdproplus/buildlink3.mk"
46.include "../../ham/hackrf/buildlink3.mk" 48.include "../../ham/hackrf/buildlink3.mk"
 49.include "../../ham/soapy-sdr/buildlink3.mk"
47 50
 51BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.8
48.include "../../ham/gnuradio-core/buildlink3.mk" 52.include "../../ham/gnuradio-core/buildlink3.mk"
49.include "../../ham/gnuradio-fcd/buildlink3.mk" 
50.include "../../ham/gnuradio-uhd/buildlink3.mk" 53.include "../../ham/gnuradio-uhd/buildlink3.mk"
51 54
52.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"