Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 48FA784CD8 for ; Tue, 27 Jun 2023 10:40:41 +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 7VaDd72uN9Cz for ; Tue, 27 Jun 2023 10:40:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8218984CCC for ; Tue, 27 Jun 2023 10:40:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7FBEEFA89; Tue, 27 Jun 2023 10:40:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1687862440162350" MIME-Version: 1.0 Date: Tue, 27 Jun 2023 10:40:40 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/devel/imake To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230627104040.7FBEEFA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1687862440162350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Tue Jun 27 10:40:40 UTC 2023 Modified Files: pkgsrc/devel/imake: Makefile Log Message: devel/imake: Make this cross-compile. Pacify imake's insistence on executing tradcpp at build-time just for configure checks, even though what does in the end is bake a path to tradcpp into the build product to execute at run-time. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/imake/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1687862440162350 Content-Disposition: inline Content-Length: 1226 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/imake/Makefile diff -u pkgsrc/devel/imake/Makefile:1.30 pkgsrc/devel/imake/Makefile:1.31 --- pkgsrc/devel/imake/Makefile:1.30 Wed Nov 9 13:14:08 2022 +++ pkgsrc/devel/imake/Makefile Tue Jun 27 10:40:40 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2022/11/09 13:14:08 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2023/06/27 10:40:40 riastradh Exp $ DISTNAME= imake-1.0.9 CATEGORIES= devel x11 @@ -12,13 +12,19 @@ COMMENT= Obsolete build tool for X soft GNU_CONFIGURE= yes USE_TOOLS+= pkg-config makedepend:run +TOOL_DEPENDS+= tradcpp>=0.5.2:../../devel/tradcpp DEPENDS+= tradcpp>=0.5.2:../../devel/tradcpp DEPENDS+= xorg-cf-files>=1.0.3:../../x11/xorg-cf-files CONFIGURE_ENV+= APP_MAN_SUFFIX=1 CONFIGURE_ENV+= HAS_PERL=no -CONFIGURE_ENV+= RAWCPP=${PREFIX}/bin/tradcpp -CPPFLAGS+= -DRAWCPP=\"${PREFIX}/bin/tradcpp\" +CONFIGURE_ENV+= RAWCPP=${TOOLBASE:Q}/bin/tradcpp + +# The configure script wants to run tradcpp to test its +# characteristics, but what gets baked into the package needs to be +# where tradcpp will live at run-time. +CPPFLAGS+= -DRAWCPP=\"${PREFIX:Q}/bin/tradcpp\" +MAKE_FLAGS+= RAWCPP=${PREFIX:Q}/bin/rawcpp REPLACE_SH+= mkhtmlindex.sh --_----------=_1687862440162350--