Received: by mail.netbsd.org (Postfix, from userid 605) id 0B86984DBC; Tue, 19 May 2020 13:58:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 886E584D6C for ; Tue, 19 May 2020 13:58:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id kaNPMD6qTWd1 for ; Tue, 19 May 2020 13:58:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EC48984D44 for ; Tue, 19 May 2020 13:58:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E9D91FB27; Tue, 19 May 2020 13:58:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1589896704272670" MIME-Version: 1.0 Date: Tue, 19 May 2020 13:58:24 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/ham To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200519135824.E9D91FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1589896704272670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue May 19 13:58:24 UTC 2020 Modified Files: pkgsrc/ham/gnuradio-core: Makefile.common options.mk pkgsrc/ham/gnuradio-doxygen: Makefile Removed Files: pkgsrc/ham/gnuradio-core/files: REPLACE_PYTHON Log Message: Avoid rebuilding everything for doxygen, just the docs are fine. Don't keep an insanely long hand-maintained list of Python files, go with wildcards. Simplify various build commands. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/ham/gnuradio-core/Makefile.common cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/gnuradio-core/options.mk cvs rdiff -u -r1.7 -r0 pkgsrc/ham/gnuradio-core/files/REPLACE_PYTHON cvs rdiff -u -r1.31 -r1.32 pkgsrc/ham/gnuradio-doxygen/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1589896704272670 Content-Disposition: inline Content-Length: 2800 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/ham/gnuradio-core/Makefile.common diff -u pkgsrc/ham/gnuradio-core/Makefile.common:1.23 pkgsrc/ham/gnuradio-core/Makefile.common:1.24 --- pkgsrc/ham/gnuradio-core/Makefile.common:1.23 Sat Jan 18 23:32:39 2020 +++ pkgsrc/ham/gnuradio-core/Makefile.common Tue May 19 13:58:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2020/01/18 23:32:39 rillig Exp $ +# $NetBSD: Makefile.common,v 1.24 2020/05/19 13:58:24 joerg Exp $ # This Makefile fragment is included in the package Makefiles for # GNU Radio distributed packages (they all share common configure and build # settings). @@ -124,14 +124,14 @@ SUBST_MESSAGE.pyvers= Fix SPHINX_EXECUTA SUBST_VARS.pyvers+= PYVERSSUFFIX SUBST_STAGE.pyvers= pre-configure -# REPLACE_PYTHON is some 600 files -.include "../../ham/gnuradio-core/files/REPLACE_PYTHON" +REPLACE_PYTHON = */*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \ + */*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py pre-configure: - (${MKDIR} ${WRKSRC}/build;) + ${MKDIR} ${WRKSRC}/build do-install: - (cd ${WRKSRC}/build; ${GMAKE} DESTDIR=${DESTDIR} install) + cd ${WRKSRC}/${BUILD_DIRS} && ${GMAKE} DESTDIR=${DESTDIR} install .include "../../audio/gsm/buildlink3.mk" .include "../../audio/jack/buildlink3.mk" Index: pkgsrc/ham/gnuradio-core/options.mk diff -u pkgsrc/ham/gnuradio-core/options.mk:1.5 pkgsrc/ham/gnuradio-core/options.mk:1.6 --- pkgsrc/ham/gnuradio-core/options.mk:1.5 Sun Nov 3 19:32:07 2019 +++ pkgsrc/ham/gnuradio-core/options.mk Tue May 19 13:58:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2019/11/03 19:32:07 rillig Exp $ +# $NetBSD: options.mk,v 1.6 2020/05/19 13:58:24 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa @@ -19,10 +19,10 @@ CMAKE_ARGS+= -GNinja BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build do-build: - (cd ${WRKSRC}/build; ninja) + cd ${WRKSRC}/${BUILD_DIRS} && ${PKGSRC_SETENV} ${MAKE_ENV} ninja .else do-build: - (cd ${WRKSRC}/build; ${BUILD_MAKE_CMD}) + cd ${WRKSRC}/${BUILD_DIRS} && ${BUILD_MAKE_CMD} .endif .if !empty(PKG_OPTIONS:Mfilter-design) Index: pkgsrc/ham/gnuradio-doxygen/Makefile diff -u pkgsrc/ham/gnuradio-doxygen/Makefile:1.31 pkgsrc/ham/gnuradio-doxygen/Makefile:1.32 --- pkgsrc/ham/gnuradio-doxygen/Makefile:1.31 Wed May 6 14:04:41 2020 +++ pkgsrc/ham/gnuradio-doxygen/Makefile Tue May 19 13:58:24 2020 @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.31 2020/05/06 14:04:41 adam Exp $ +# $NetBSD: Makefile,v 1.32 2020/05/19 13:58:24 joerg Exp $ PKGNAME= gnuradio-doxygen-${VERSION} PKGREVISION= 4 COMMENT= Doxygen documentation of GNU Radio +BUILD_DIRS= build/docs + .include "../../ham/gnuradio-core/Makefile.common" .include "../../ham/gnuradio-core/Nocore.mk" --_----------=_1589896704272670--