Re: fix parallel build of automake-1.16

2019-01-13 Thread Klemens Nanni
OK



Re: fix parallel build of automake-1.16

2019-01-13 Thread Kirill Bychkov
On Sun, January 13, 2019 15:57, Rafael Sadowski wrote:
> On Sat Jan 12, 2019 at 11:09:30PM +0300, Kirill Bychkov wrote:
>> Hi!
>> automake-1.16 fails to build with MAKE_JOBS set in mk.conf
>> with the following error:
>>
>> :  && mkdir -p doc  && ./pre-inst-env /usr/bin/perl ./doc/help2man
>> --output=doc/aclocal-1.16.1 aclocal-1.16
>> :  && mkdir -p doc  && ./pre-inst-env /usr/bin/perl ./doc/help2man
>> --output=doc/automake-1.16.1 automake-1.16
>> help2man: can't get `--help' info from aclocal-1.16
>> Try `--no-discard-stderr' if option outputs to stderr
>> help2man: can't get `--help' info from automake-1.16
>> Try `--no-discard-stderr' if option outputs to stderr
>>
>> The patch below fixes build. Tested with MAKE_JOBS=2 on amd64
>> and i386.
>
> Hmm, no issues with MAKE_JOBS=4 and without your patch on amd64.

Furhter testing showed up that it fails without a patch every time
with MAKE_JOBS=2, about 1 time from 20 with MAKE_JOBS=4 and 1 time
of 2 with MAKE_JOBS=6.

>>
>> OK to commit?
>>
>> Index: patches/patch-Makefile_in
>> ===
>> RCS file: patches/patch-Makefile_in
>> diff -N patches/patch-Makefile_in
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-Makefile_in12 Jan 2019 20:02:58 -
>> @@ -0,0 +1,20 @@
>> +$OpenBSD$
>> +
>> +Fix parallel build.Taken from FreeBSD.
>> +https://svnweb.freebsd.org/ports/head/devel/automake/files/patch-Makefile.in?revision=474011=markup
>
> I think the link is uesless because no more additional informations.

OK

>> +
>> +Index: Makefile.in
>> +--- Makefile.in.orig
>>  Makefile.in
>> +@@ -3690,9 +3690,9 @@ doc/aclocal.1 doc/automake.1:
>> +  && echo ".so man1/$$f-$(APIVERSION).1" > $@
>> +
>> + doc/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
>> +-   $(update_mans) aclocal-$(APIVERSION)
>> ++   $(update_mans) $(aclocal_script)
>> + doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
>> +-   $(update_mans) automake-$(APIVERSION)
>> ++   $(update_mans) $(automake_script)
>> +
>> + # We depend on configure.ac so that we regenerate the tarball
>> + # whenever the Automake version changes.
>>
>>
>




Re: fix parallel build of automake-1.16

2019-01-13 Thread Rafael Sadowski
On Sat Jan 12, 2019 at 11:09:30PM +0300, Kirill Bychkov wrote:
> Hi!
> automake-1.16 fails to build with MAKE_JOBS set in mk.conf
> with the following error:
> 
> :  && mkdir -p doc  && ./pre-inst-env /usr/bin/perl ./doc/help2man
> --output=doc/aclocal-1.16.1 aclocal-1.16
> :  && mkdir -p doc  && ./pre-inst-env /usr/bin/perl ./doc/help2man
> --output=doc/automake-1.16.1 automake-1.16
> help2man: can't get `--help' info from aclocal-1.16
> Try `--no-discard-stderr' if option outputs to stderr
> help2man: can't get `--help' info from automake-1.16
> Try `--no-discard-stderr' if option outputs to stderr
> 
> The patch below fixes build. Tested with MAKE_JOBS=2 on amd64
> and i386.

Hmm, no issues with MAKE_JOBS=4 and without your patch on amd64.

> 
> OK to commit?
> 
> Index: patches/patch-Makefile_in
> ===
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Makefile_in 12 Jan 2019 20:02:58 -
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Fix parallel build.Taken from FreeBSD.
> +https://svnweb.freebsd.org/ports/head/devel/automake/files/patch-Makefile.in?revision=474011=markup

I think the link is uesless because no more additional informations.

> +
> +Index: Makefile.in
> +--- Makefile.in.orig
>  Makefile.in
> +@@ -3690,9 +3690,9 @@ doc/aclocal.1 doc/automake.1:
> +   && echo ".so man1/$$f-$(APIVERSION).1" > $@
> +
> + doc/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
> +-$(update_mans) aclocal-$(APIVERSION)
> ++$(update_mans) $(aclocal_script)
> + doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
> +-$(update_mans) automake-$(APIVERSION)
> ++$(update_mans) $(automake_script)
> +
> + # We depend on configure.ac so that we regenerate the tarball
> + # whenever the Automake version changes.
> 
> 



fix parallel build of automake-1.16

2019-01-12 Thread Kirill Bychkov
Hi!
automake-1.16 fails to build with MAKE_JOBS set in mk.conf
with the following error:

:  && mkdir -p doc  && ./pre-inst-env /usr/bin/perl ./doc/help2man
--output=doc/aclocal-1.16.1 aclocal-1.16
:  && mkdir -p doc  && ./pre-inst-env /usr/bin/perl ./doc/help2man
--output=doc/automake-1.16.1 automake-1.16
help2man: can't get `--help' info from aclocal-1.16
Try `--no-discard-stderr' if option outputs to stderr
help2man: can't get `--help' info from automake-1.16
Try `--no-discard-stderr' if option outputs to stderr

The patch below fixes build. Tested with MAKE_JOBS=2 on amd64
and i386.

OK to commit?

Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in   12 Jan 2019 20:02:58 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Fix parallel build.Taken from FreeBSD.
+https://svnweb.freebsd.org/ports/head/devel/automake/files/patch-Makefile.in?revision=474011=markup
+
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -3690,9 +3690,9 @@ doc/aclocal.1 doc/automake.1:
+ && echo ".so man1/$$f-$(APIVERSION).1" > $@
+
+ doc/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
+-  $(update_mans) aclocal-$(APIVERSION)
++  $(update_mans) $(aclocal_script)
+ doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
+-  $(update_mans) automake-$(APIVERSION)
++  $(update_mans) $(automake_script)
+
+ # We depend on configure.ac so that we regenerate the tarball
+ # whenever the Automake version changes.