pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/ham/gnuradio-uhd don't set UHD_LIBRARIES and UHD_INCLU...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f474d0023a2a
branches:  trunk
changeset: 645339:f474d0023a2a
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Jan 27 07:05:17 2015 +0000

description:
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

diffstat:

 ham/gnuradio-uhd/Makefile |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r b24db6a29136 -r f474d0023a2a ham/gnuradio-uhd/Makefile
--- a/ham/gnuradio-uhd/Makefile Tue Jan 27 06:38:49 2015 +0000
+++ b/ham/gnuradio-uhd/Makefile Tue Jan 27 07:05:17 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/10/13 12:51:10 mef Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/27 07:05:17 dbj Exp $
 
 PKGNAME=       gnuradio-uhd-${VERSION}
 COMMENT=       Uhd-based encoding and decoding algorithms for GNU Radio
@@ -12,8 +12,14 @@
 CMAKE_ARGS+=   -DENABLE_GR_UHD=True
 CMAKE_ARGS+=   -DENABLE_PYTHON=True
 
+.if ${OPSYS} != "Darwin"
+# XXX dbj -- i'm not sure why this is necessary, but hard coding
+# the .so causes problems on Darwin.  I've also set UHD_DIR in
+# the uhd buildlink3.mk file, so it finds the buildlink header files.
+
 CMAKE_ARGS+=   -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so
 CMAKE_ARGS+=   -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp
+.endif
 
 .include       "../../ham/uhd/buildlink3.mk"
 



Home | Main Index | Thread Index | Old Index