NetBSD Problem Report #44696

From cheusov@tut.by  Mon Mar  7 23:33:20 2011
Return-Path: <cheusov@tut.by>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id CA73563B874
	for <gnats-bugs@gnats.netbsd.org>; Mon,  7 Mar 2011 23:33:20 +0000 (UTC)
Message-Id: <8762ruqzes.fsf@asrock.chizhovka.net>
Date: Tue, 08 Mar 2011 01:33:15 +0200
From: cheusov@tut.by
To: gnats-bugs@gnats.NetBSD.org
Subject: Support for diverse make-compatible MAKE_PROGRAMs [patch]
X-Send-Pr-Version: 3.95

>Number:         44696
>Category:       pkg
>Synopsis:       Support for diverse make-like MAKE_PROGRAMs [patch]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 07 23:35:00 +0000 2011
>Closed-Date:    Tue Apr 05 12:42:25 +0000 2011
>Last-Modified:  Tue Apr 05 12:45:01 +0000 2011
>Originator:     Aleksey Cheusov
>Release:        NetBSD 5.1
>Organization:
>Environment:
System: NetBSD asrock.chizhovka.net 5.1 NetBSD 5.1 (GENERIC) #0: Mon Jan 31 23:53:52 EET 2011 cheusov@asrock.chizhovka.net:/srv/obj/sys/arch/amd64/compile/GENERIC amd64
Architecture: x86_64
Machine: amd64
>Description:
A number of packages in pkgsrc use make-like programs (none of
the following: imake, bmake, gmake) for building the package. For this
purpose they set MAKE_PROGRAM variable directly in package's Makefile
because it is simplier than rewriting do-build and/or do-install targets.

Due to

  MAKE_PROGRAM=${MAKE}

line in mk/tools/make.mk, MAKE_PROGRAM=make-like-tool statement is placed *below*

 .include "bsd.pkg.mk"

in order to override `='. This looks ugly. Also pkglint complains
about such assignment.  I propose to change MAKE_PROGRAM variable acl
in pkglint and to use ?= instead of =. Patch is below.

>How-To-Repeat:

>Fix:
Index: mk/tools/make.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/make.mk,v
retrieving revision 1.13
diff -u -r1.13 make.mk
--- mk/tools/make.mk	17 Jul 2005 21:36:24 -0000	1.13
+++ mk/tools/make.mk	7 Mar 2011 23:10:23 -0000
@@ -52,7 +52,7 @@
 .elif !empty(_USE_TOOLS:Mimake) && defined(IMAKE_MAKE)
 MAKE_PROGRAM=		${IMAKE_MAKE}
 .else
-MAKE_PROGRAM=		${MAKE}
+MAKE_PROGRAM?=		${MAKE}
 .endif

 TOOLS_CREATE+=		make
Index: pkgtools/pkglint/files/makevars.map
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/makevars.map,v
retrieving revision 1.208
diff -u -r1.208 makevars.map
--- pkgtools/pkglint/files/makevars.map	10 Feb 2011 12:08:04 -0000	1.208
+++ pkgtools/pkglint/files/makevars.map	7 Mar 2011 23:10:23 -0000
@@ -435,7 +435,7 @@
 MAKE_FLAGS		List of ShellWord [$package_list]
 MAKE_JOBS		Integer [$user]
 MAKE_JOBS_SAFE		YesNo [$package]
-MAKE_PROGRAM		ShellCommand [$system]
+MAKE_PROGRAM		ShellCommand [$package]
 MANCOMPRESSED		YesNo [m:s,c:ds]
 MANCOMPRESSED_IF_MANZ	Yes [m:s,c:ds]
 MANGRP			UserGroupName [$system]

>Release-Note:

>Audit-Trail:
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc: 
Subject: Re: pkg/44696: Support for diverse make-compatible MAKE_PROGRAMs
 [patch]
Date: Tue, 8 Mar 2011 10:05:40 +0100

 On Mon, Mar 07, 2011 at 11:35:00PM +0000, cheusov@tut.by wrote:
 > >Number:         44696
 > >Category:       pkg
 > >Synopsis:       Support for diverse make-like MAKE_PROGRAMs [patch]

 This sounds interesting. Can you send a tested example patch for
 a package that currently override do-build/do-install instead to show
 how this would simplify things?

 Thanks,
  Thomas

From: Aleksey Cheusov <cheusov@tut.by>
To: gnats-bugs@NetBSD.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org
Subject: Re: pkg/44696: Support for diverse make-compatible MAKE_PROGRAMs [patch]
Date: Tue, 08 Mar 2011 11:28:23 +0200

 >  This sounds interesting. Can you send a tested example patch for
 >  a package that currently override do-build/do-install instead to show
 >  how this would simplify things?

 Have a look at lang/runawk/Makefile, wip/pkg_summary-utils, wip/distbb
 or some other my packages in wip based on mk-configure. There I have
 only one line.

  MAKE_PROGRAM = mkcmake

 Replacing it with manual do-build and do-install targets is not a good
 idea because default ones are just excellent except make program.
 mkcmake is a trivial wrapper over bmake (actually bmake -m
 /path/to/includes), so it is fully compatible with default do-build and do-install.

 -- 
 Best regards, Aleksey Cheusov.

From: Aleksey Cheusov <cheusov@tut.by>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/44696: Support for diverse make-compatible MAKE_PROGRAMs [patch]
Date: Tue, 08 Mar 2011 11:40:35 +0200

  >> >Synopsis:       Support for diverse make-like MAKE_PROGRAMs [patch]
 >  
 >  This sounds interesting. Can you send a tested example patch for
 >  a package that currently override do-build/do-install instead to show
 >  how this would simplify things?

 More examples:
    wip/backplane  (dxmake is used here)
    wip/diablo     (xmake)
    lang/boomerang (omake, though I'm not sure it is make-like)

 -- 
 Best regards, Aleksey Cheusov.

State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Tue, 05 Apr 2011 12:42:25 +0000
State-Changed-Why:
Committed, thank you!


From: "Thomas Klausner" <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/44696 CVS commit: pkgsrc
Date: Tue, 5 Apr 2011 12:42:07 +0000

 Module Name:	pkgsrc
 Committed By:	wiz
 Date:		Tue Apr  5 12:42:07 UTC 2011

 Modified Files:
 	pkgsrc/mk/tools: make.mk
 	pkgsrc/pkgtools/pkglint/files: makevars.map

 Log Message:
 Make MAKE_PROGRAM overridable by packages.
 From Aleksey Cheusov in PR 44696.


 To generate a diff of this commit:
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/tools/make.mk
 cvs rdiff -u -r1.208 -r1.209 pkgsrc/pkgtools/pkglint/files/makevars.map

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

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.