pkgsrc-WIP-changes archive

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

(ham/gnuradio-core, channels) Adjusting DEPENDS in Makefile and Makefile.common



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Wed Aug 12 19:43:17 2020 +0900
Changeset:	63d4bd225da5511ca60daf934be4128db70317b6

Modified Files:
	gnuradio-channels/Makefile
	gnuradio-core/Makefile.common

Log Message:
(ham/gnuradio-core, channels) Adjusting DEPENDS in Makefile and Makefile.common

1. mv  2 of DEPENDS from gnuradio-channels/Makefile to gnuradio-core/Makefile.common
   (py-yaml, and py-numpy)

2. add 3 of DEPENDS to       gnuradio-core/Makefile.common
   (py-mako, py-cairo, py-gobject3)

3. add 3 of buildlink3.mk to gnuradio-core/Makefile.common
   (cairo, cairo-gobject, gtk3)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=63d4bd225da5511ca60daf934be4128db70317b6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnuradio-channels/Makefile    | 2 --
 gnuradio-core/Makefile.common | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs:
diff --git a/gnuradio-channels/Makefile b/gnuradio-channels/Makefile
index dc12aa6a28..6c158ca236 100644
--- a/gnuradio-channels/Makefile
+++ b/gnuradio-channels/Makefile
@@ -9,8 +9,6 @@ COMMENT=	Signal processing blocks to simulate channel models of GNU Radio
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_CHANNELS=ON
 CMAKE_ARGS+=	-DENABLE_GRC=ON
-DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 
 PLIST_MINUS+=	companion
 
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index ce5132683d..d4640a0858 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -44,6 +44,11 @@ DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 # gr_filter_design in gnuradio-core ask for:
 DEPENDS+=	${PYPKGPREFIX}-qwt-qt5-[0-9]*:../../wip/py-qwt-qt5
+DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 DISTINFO_FILE=		${.CURDIR}/../../wip/gnuradio-core/distinfo
 PATCHDIR=		${.CURDIR}/../../wip/gnuradio-core/patches
@@ -150,3 +155,6 @@ do-install:
 .include	"../../math/volk/buildlink3.mk"
 .include	"../../textproc/log4cpp/buildlink3.mk"
 .include	"../../textproc/icu/buildlink3.mk"
+.include	"../../graphics/cairo/buildlink3.mk"
+.include	"../../graphics/cairo-gobject/buildlink3.mk"
+.include	"../../x11/gtk3/buildlink3.mk"


Home | Main Index | Thread Index | Old Index