Re: net/kea: Ensure base awk is used

2016-07-11 Thread Christian Weisgerber
On 2016-06-27, Stuart Henderson  wrote:

> ...but there's also this in config.site, which seems incorrect:
>
> ac_cv_prog_AWK=${ac_cv_prog_AWK=awk}

If you mean that it should use the full path, then no, it's correct
as is.  Putting /usr/bin/awk there causes build errors, because
some of the autoconf magic that uses ac_cv_prog_AWK can't handle a
full path.

We have:

  config.site:
  ac_cv_prog_AWK=${ac_cv_prog_AWK=awk}

  config.no-gawk:
  ac_cv_prog_AWK=${ac_cv_prog_AWK=/usr/bin/awk}

Since ac_cv_prog_AWK is already set, the entry in config.no-gawk
is never used.  Instead we want to set ac_cv_path_AWK in config.no-gawk.

I suggest the patch below.  I've had this in the last two amd64
bulk builds.  Yes, here the full path is fine.

OK?

Index: config.no-gawk
===
RCS file: /cvs/ports/infrastructure/db/config.no-gawk,v
retrieving revision 1.1
diff -u -r1.1 config.no-gawk
--- config.no-gawk  12 Dec 2011 10:33:33 -  1.1
+++ config.no-gawk  6 Jul 2016 21:39:46 -
@@ -1,3 +1,3 @@
 # $OpenBSD: config.no-gawk,v 1.1 2011/12/12 10:33:33 jasper Exp $
 # included unless lang/gawk
-ac_cv_prog_AWK=${ac_cv_prog_AWK=/usr/bin/awk}
+ac_cv_path_AWK=${ac_cv_path_AWK=/usr/bin/awk}
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



Re: net/kea: Ensure base awk is used

2016-06-27 Thread Christian Weisgerber
On 2016-06-27, Stuart Henderson  wrote:

>> That should already be set. Is it not picking up config.site for some reason?
>
> Oh, it is ac_cv_*prog*_AWK that is getting set, for some reason kea
> is also looking at ac_cv_*path*_AWK.
>
> Perhaps we should add the path variant to config.site then..

In fact, ac_cv_prog_AWK is set in both config.site and again in
config.no-gawk.  That doesn't make sense.

I suspect the intention was to set ac_cv_path_AWK in config.no-gawk.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



Re: net/kea: Ensure base awk is used

2016-06-27 Thread Stuart Henderson
On 2016/06/27 21:10, David Coppa wrote:
> On Mon, Jun 27, 2016 at 6:26 PM, Stuart Henderson  
> wrote:
> 
> > Perhaps we should add the path variant to config.site then..
> 
> It looks like the right approach to me, ok dcoppa@.

These are the relevant ports,

bacula-7.4.0
check-0.10.0
check_mssql_health-1.5.19
clusterit-2.5
djview4-4.10.6
elinks-0.11.7
freedroidrpg-0.16
geda-gaf-1.6.0
kea-1.0.0
lam-6.5.9
latex-mk-1.9.1
lbdb_0.40
libgnome-2.32.1
libgnomecanvas-2.30.3
libgnomeui-2.24.5
libreoffice-5.1.2.2
libsmi-0.4.8
quilt-0.64
xboard-4.8.0

basic diff:

Index: config.no-gawk
===
RCS file: /cvs/ports/infrastructure/db/config.no-gawk,v
retrieving revision 1.1
diff -u -p -r1.1 config.no-gawk
--- config.no-gawk  12 Dec 2011 10:33:33 -  1.1
+++ config.no-gawk  27 Jun 2016 19:32:34 -
@@ -1,3 +1,4 @@
 # $OpenBSD: config.no-gawk,v 1.1 2011/12/12 10:33:33 jasper Exp $
 # included unless lang/gawk
 ac_cv_prog_AWK=${ac_cv_prog_AWK=/usr/bin/awk}
+ac_cv_path_AWK=${ac_cv_path_AWK=/usr/bin/awk}

...but there's also this in config.site, which seems incorrect:

ac_cv_prog_AWK=${ac_cv_prog_AWK=awk}



Re: net/kea: Ensure base awk is used

2016-06-27 Thread David Coppa
On Mon, Jun 27, 2016 at 6:26 PM, Stuart Henderson  wrote:

> Perhaps we should add the path variant to config.site then..

It looks like the right approach to me, ok dcoppa@.

ciao!
David



Re: net/kea: Ensure base awk is used

2016-06-27 Thread Stuart Henderson
On 2016/06/27 17:19, Stuart Henderson wrote:
> On 2016/06/27 18:15, Patrik Lundin wrote:
> > +CONFIGURE_ENV+= ac_cv_path_AWK=awk
> 
> That should already be set. Is it not picking up config.site for some reason?
> 

Oh, it is ac_cv_*prog*_AWK that is getting set, for some reason kea
is also looking at ac_cv_*path*_AWK.

Perhaps we should add the path variant to config.site then..



Re: net/kea: Ensure base awk is used

2016-06-27 Thread Stuart Henderson
On 2016/06/27 18:15, Patrik Lundin wrote:
> +CONFIGURE_ENV+= ac_cv_path_AWK=awk

That should already be set. Is it not picking up config.site for some reason?