Tue Jan 27 07:05:17 2015 UTC ()
don't set UHD_LIBRARIES and UHD_INCLUDE_DIRS in CMAKE_ARGS on Darwin
The explicit use of .so in the shared lib causes a problem.
I've also set UHD_DIR in the environment in the UHD buildlink3.mk file
which should make these two CMAKE_ARGS unnecessary


(dbj)
diff -r1.1 -r1.2 pkgsrc/ham/gnuradio-uhd/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/ham/gnuradio-uhd/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-uhd/Makefile 2014/10/13 12:51:10 1.1
+++ pkgsrc/ham/gnuradio-uhd/Makefile 2015/01/27 07:05:17 1.2
@@ -1,20 +1,26 @@ @@ -1,20 +1,26 @@
1# $NetBSD: Makefile,v 1.1 2014/10/13 12:51:10 mef Exp $ 1# $NetBSD: Makefile,v 1.2 2015/01/27 07:05:17 dbj Exp $
2 2
3PKGNAME= gnuradio-uhd-${VERSION} 3PKGNAME= gnuradio-uhd-${VERSION}
4COMMENT= Uhd-based encoding and decoding algorithms for GNU Radio 4COMMENT= Uhd-based encoding and decoding algorithms for GNU Radio
5 5
6# (acutually, redundent for now) 6# (acutually, redundent for now)
7PKG_OPTIONS.gnuradio= 7PKG_OPTIONS.gnuradio=
8.include "../../ham/gnuradio-core/Makefile.common" 8.include "../../ham/gnuradio-core/Makefile.common"
9.include "../../ham/gnuradio-core/Nocore.mk" 9.include "../../ham/gnuradio-core/Nocore.mk"
10 10
11CMAKE_ARGS+= -DENABLE_DEFAULT=False 11CMAKE_ARGS+= -DENABLE_DEFAULT=False
12CMAKE_ARGS+= -DENABLE_GR_UHD=True 12CMAKE_ARGS+= -DENABLE_GR_UHD=True
13CMAKE_ARGS+= -DENABLE_PYTHON=True 13CMAKE_ARGS+= -DENABLE_PYTHON=True
14 14
 15.if ${OPSYS} != "Darwin"
 16# XXX dbj -- i'm not sure why this is necessary, but hard coding
 17# the .so causes problems on Darwin. I've also set UHD_DIR in
 18# the uhd buildlink3.mk file, so it finds the buildlink header files.
 19
15CMAKE_ARGS+= -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so 20CMAKE_ARGS+= -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so
16CMAKE_ARGS+= -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp 21CMAKE_ARGS+= -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp
 22.endif
17 23
18.include "../../ham/uhd/buildlink3.mk" 24.include "../../ham/uhd/buildlink3.mk"
19 25
20.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"