pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(ham/gnuradio-monolithic) remove Nocore.mk, version.mk Makefile.common
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By: mef
Date: Sun Apr 9 10:57:15 2023 +0900
Changeset: c20911d4d7bfc2ad2442bf017120b20b42a999d1
Modified Files:
gnuradio-monolithic/Makefile
Removed Files:
gnuradio-monolithic/Makefile.common
gnuradio-monolithic/version.mk
Log Message:
(ham/gnuradio-monolithic) remove Nocore.mk, version.mk Makefile.common
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c20911d4d7bfc2ad2442bf017120b20b42a999d1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnuradio-monolithic/Makefile | 158 ++++++++++++++++++++++++++++++---
gnuradio-monolithic/Makefile.common | 169 ------------------------------------
gnuradio-monolithic/version.mk | 3 -
3 files changed, 145 insertions(+), 185 deletions(-)
diffs:
diff --git a/gnuradio-monolithic/Makefile b/gnuradio-monolithic/Makefile
index de3d2a0919..43c6a99681 100644
--- a/gnuradio-monolithic/Makefile
+++ b/gnuradio-monolithic/Makefile
@@ -1,9 +1,152 @@
# $NetBSD: Makefile,v 1.107 2023/04/07 12:58:01 mef Exp $
+VERSION= 3.10.6.0
PKGNAME= gnuradio-monolithic-${VERSION}
COMMENT= GNU Software Defined Radio Monolithic version
-#PLIST_MINUS= # empty
-.include "Makefile.common"
+
+DISTNAME?= gnuradio-${VERSION}
+CATEGORIES+= ham
+#MASTER_SITES= http://s3-dist.gnuradio.org/
+#MASTER_SITES+= http://gnuradio.org/releases/gnuradio/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=gnuradio/}
+GITHUB_PROJECT= gnuradio
+GITHUB_TAG= v${VERSION}
+
+MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE?= https://www.gnu.org/software/gnuradio/
+LICENSE= gnu-gpl-v3
+
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS= gmake perl pkg-config
+
+GCC_REQD+= 8
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
+USE_PKGSRC_GCC= yes
+USE_PKGSRC_GCC_RUNTIME= yes
+.endif
+
+DEPENDS+= ${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
+DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
+DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
+DEPENDS+= ${PYPKGPREFIX}-pygccxml-[0-9]*:../../textproc/py-pygccxml
+# for companion
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+
+DISTINFO_FILE= ${.CURDIR}/../../ham/gnuradio-core/distinfo
+PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
+
+# see CMakeLists.txt GR_PYTHON_MIN_VERSION
+PYTHON_VERSIONS_INCOMPATIBLE= 27 37 # py-scipy
+
+# three digit version number for shared library ex 3.10.2.0 -> 3.10.2
+PKGVER_MICRO= ${PKGVERSION_NOREV:C/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\3/}
+
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+# avoid using the name PKGVERSION in variable, see Nocore.mk
+PLIST_SUBST+= PKGVER_MICRO=${PKGVER_MICRO}
+PY_PATCHPLIST= yes
+
+CONFIGURE_DIRS= build
+
+EGDIR= share/gnuradio/examples
+PKG_SYSCONFSUBDIR= gnuradio/conf.d
+
+CXXFLAGS+= -pthread
+CFLAGS+= -pthread
+LDFLAGS.DragonFly+= -lboost_system
+LDFLAGS.NetBSD+= -lrt
+LDFLAGS.SunOS+= -lboost_system
+CXXFLAGS.SunOS+= -pthreads
+
+INSTALLATION_DIRS+= ${EGDIR}
+
+# -------- R E S E T CMAKE_ARGS H E R E -------------
+CMAKE_ARGS=
+
+CMAKE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
+CMAKE_ARGS+= -DENABLE_GR_ANALOG=ON
+CMAKE_ARGS+= -DENABLE_GR_AUDIO=ON
+CMAKE_ARGS+= -DENABLE_GR_BLOCKS=ON
+CMAKE_ARGS+= -DENABLE_GR_FFT=ON
+CMAKE_ARGS+= -DENABLE_GR_FILTER=ON
+CMAKE_ARGS+= -DENABLE_PYTHON=ON
+
+CMAKE_ARGS+= -DLIB_SUFFIX=""
+
+# Default setting (for pkgsrc)
+CMAKE_ARGS+= -Wno-dev
+CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
+CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
+CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
+CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
+CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
+
+CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
+CMAKE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
+
+# adhoc setup not to pick non default version (say python3.6)
+# at configure
+#CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
+
+CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_ARG_PATH= ../
+
+.include "options.mk"
+
+# disable/enable ALSA, see also patches/patch-gr-audio_lib_CMakeLists.txt
+SUBST_CLASSES+= alsa
+SUBST_MESSAGE.alsa= Arrange the patched line depepending on alsa is in PKG_OPTIONS or not
+SUBST_FILES.alsa+= gr-audio/lib/CMakeLists.txt
+## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk.
+SUBST_SED.alsa= -e 's,@@ALSA@@,${ALSA_ENABLED},'
+SUBST_STAGE.alsa= pre-configure
+
+SUBST_CLASSES+= prefix
+SUBST_STAGE.prefix= pre-configure
+SUBST_MESSAGE.prefix= Substitute PREFIX
+SUBST_FILES.prefix= gnuradio-runtime/lib/constants.cc.in
+SUBST_VARS.prefix= PREFIX
+
+REPLACE_PYTHON= */*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
+ */*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py
+
+pre-configure:
+ ${MKDIR} ${WRKSRC}/build
+
+do-install:
+ cd ${WRKSRC}/${BUILD_DIRS} && ${GMAKE} DESTDIR=${DESTDIR} install
+
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../audio/jack/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cppunit/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/spdlog/buildlink3.mk"
+BUILDLINK_API_DEPENDS.py-pybind11+= ${PYPKGPREFIX}-pybind11>=2.6.0
+.include "../../devel/py-pybind11/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
+# FIXME should be optional
+.include "../../lang/libunwind/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../math/fftw/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
+.include "../../math/py-numpy/buildlink3.mk"
+.include "../../math/volk/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/fmtlib/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
TOOL_DEPENDS+= tex-newunicodechar-[0-9]*:../../print/tex-newunicodechar
@@ -12,20 +155,9 @@ TOOL_DEPENDS+= tex-newunicodechar-[0-9]*:../../print/tex-newunicodechar
#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf
#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf
-#include "../../mk/oss.buildlink3.mk"
-#if ${OSS_TYPE} != "none"
-#CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
-#LIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss
-#endif
-
-# set default as minimum
-# CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_VIDEO_SDL=ON
CMAKE_ARGS+= -DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
-# for #include <SoapySDR/Types.hpp>
-#CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/
-
# Take care CONF_FILES stuff (The same code in Nocore.mk)
#post-install:
# ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \
diff --git a/gnuradio-monolithic/Makefile.common b/gnuradio-monolithic/Makefile.common
deleted file mode 100644
index 442f7a113e..0000000000
--- a/gnuradio-monolithic/Makefile.common
+++ /dev/null
@@ -1,169 +0,0 @@
-# $NetBSD: Makefile.common,v 1.44 2022/12/26 16:50:29 nia Exp $
-# This Makefile fragment is included in the package Makefiles for
-# GNU Radio distributed packages (they all share common configure and build
-# settings).
-
-# used by ham/gnuradio-channels/Makefile
-# used by ham/gnuradio-companion/Makefile
-# used by ham/gnuradio-core/Makefile
-# used by ham/gnuradio-network/Makefile
-# used by ham/gnuradio-ctrlport/Makefile
-# used by ham/gnuradio-digital/Makefile
-# used by ham/gnuradio-doxygen/Makefile
-# used by ham/gnuradio-dtv/Makefile
-# used by ham/gnuradio-fec/Makefile
-# used by ham/gnuradio-qtgui/Makefile
-# used by ham/gnuradio-soapy-sdr/Makefile
-# used by ham/gnuradio-trellis/Makefile
-# used by ham/gnuradio-uhd/Makefile
-# used by ham/gnuradio-utils/Makefile
-# used by ham/gnuradio-video-sdl/Makefile
-# used by ham/gnuradio-vocoder/Makefile
-# used by ham/gnuradio-wavelet/Makefile
-# used by ham/gnuradio-zeromq/Makefile
-
-.include "../../ham/gnuradio-core/version.mk"
-
-DISTNAME?= gnuradio-${VERSION}
-CATEGORIES+= ham
-#MASTER_SITES= http://s3-dist.gnuradio.org/
-#MASTER_SITES+= http://gnuradio.org/releases/gnuradio/
-MASTER_SITES= ${MASTER_SITE_GITHUB:=gnuradio/}
-GITHUB_PROJECT= gnuradio
-GITHUB_TAG= v${VERSION}
-
-MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE?= https://www.gnu.org/software/gnuradio/
-LICENSE= gnu-gpl-v3
-
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS= gmake perl pkg-config
-
-GCC_REQD+= 8
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
-USE_PKGSRC_GCC= yes
-USE_PKGSRC_GCC_RUNTIME= yes
-.endif
-
-DEPENDS+= ${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
-DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
-DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
-DEPENDS+= ${PYPKGPREFIX}-pygccxml-[0-9]*:../../textproc/py-pygccxml
-# for companion
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
-DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-
-DISTINFO_FILE= ${.CURDIR}/../../ham/gnuradio-core/distinfo
-PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
-
-# see CMakeLists.txt GR_PYTHON_MIN_VERSION
-PYTHON_VERSIONS_INCOMPATIBLE= 27 37 # py-scipy
-
-# three digit version number for shared library ex 3.10.2.0 -> 3.10.2
-PKGVER_MICRO= ${PKGVERSION_NOREV:C/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\3/}
-
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
-# avoid using the name PKGVERSION in variable, see Nocore.mk
-PLIST_SUBST+= PKGVER_MICRO=${PKGVER_MICRO}
-PY_PATCHPLIST= yes
-
-CONFIGURE_DIRS= build
-
-EGDIR= share/gnuradio/examples
-PKG_SYSCONFSUBDIR= gnuradio/conf.d
-
-CXXFLAGS+= -pthread
-CFLAGS+= -pthread
-LDFLAGS.DragonFly+= -lboost_system
-LDFLAGS.NetBSD+= -lrt
-LDFLAGS.SunOS+= -lboost_system
-CXXFLAGS.SunOS+= -pthreads
-
-INSTALLATION_DIRS+= ${EGDIR}
-
-# -------- R E S E T CMAKE_ARGS H E R E -------------
-CMAKE_ARGS=
-
-CMAKE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
-CMAKE_ARGS+= -DENABLE_GR_ANALOG=ON
-CMAKE_ARGS+= -DENABLE_GR_AUDIO=ON
-CMAKE_ARGS+= -DENABLE_GR_BLOCKS=ON
-CMAKE_ARGS+= -DENABLE_GR_FFT=ON
-CMAKE_ARGS+= -DENABLE_GR_FILTER=ON
-CMAKE_ARGS+= -DENABLE_PYTHON=ON
-
-CMAKE_ARGS+= -DLIB_SUFFIX=""
-
-# Default setting (for pkgsrc)
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
-CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
-CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
-
-CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
-CMAKE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
-
-# adhoc setup not to pick non default version (say python3.6)
-# at configure
-#CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
-
-CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
-CMAKE_ARG_PATH= ../
-
-.include "options.mk"
-
-# disable/enable ALSA, see also patches/patch-gr-audio_lib_CMakeLists.txt
-SUBST_CLASSES+= alsa
-SUBST_MESSAGE.alsa= Arrange the patched line depepending on alsa is in PKG_OPTIONS or not
-SUBST_FILES.alsa+= gr-audio/lib/CMakeLists.txt
-## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk.
-SUBST_SED.alsa= -e 's,@@ALSA@@,${ALSA_ENABLED},'
-SUBST_STAGE.alsa= pre-configure
-
-SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix= pre-configure
-SUBST_MESSAGE.prefix= Substitute PREFIX
-SUBST_FILES.prefix= gnuradio-runtime/lib/constants.cc.in
-SUBST_VARS.prefix= PREFIX
-
-REPLACE_PYTHON= */*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
- */*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py
-
-pre-configure:
- ${MKDIR} ${WRKSRC}/build
-
-do-install:
- cd ${WRKSRC}/${BUILD_DIRS} && ${GMAKE} DESTDIR=${DESTDIR} install
-
-.include "../../audio/gsm/buildlink3.mk"
-.include "../../audio/jack/buildlink3.mk"
-.include "../../audio/portaudio/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/cppunit/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/spdlog/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-pybind11+= ${PYPKGPREFIX}-pybind11>=2.6.0
-.include "../../devel/py-pybind11/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
-# FIXME should be optional
-.include "../../lang/libunwind/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../math/fftw/buildlink3.mk"
-.include "../../math/gsl/buildlink3.mk"
-.include "../../math/py-numpy/buildlink3.mk"
-.include "../../math/volk/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../textproc/fmtlib/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
diff --git a/gnuradio-monolithic/version.mk b/gnuradio-monolithic/version.mk
deleted file mode 100644
index 8024fb0480..0000000000
--- a/gnuradio-monolithic/version.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: version.mk,v 1.11 2023/04/07 12:58:01 mef Exp $
-
-VERSION= 3.10.6.0
Home |
Main Index |
Thread Index |
Old Index