Re: rust and NetBSD/sparc64

[Martin Husemann <martin%duskware.de@localhost>]

Here is a patch that fixes the build on NetBSD-current for at least sparc64.

Since reading diffs of diffs is inconvenient: it effectively adds a
single hunk to the existing Configurations/unix-Makefile.tmpl patch:

@@ -1058,7 +1059,7 @@
           if ($args{generator}->[0] =~ /\.pl$/) {
               $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator;
           } elsif ($args{generator}->[0] =~ /\.m4$/) {
-              $generator = 'm4 -B 8192'.$generator_incs.' '.$generator.' >'
+              $generator = 'm4 '.$generator_incs.' '.$generator.' >'
           } elsif ($args{generator}->[0] =~ /\.S$/) {
               $generator = undef;
           } else {


The "m4" command is apparently only run for some architectures which have asm
code that needs postprocessing (from memory arm was another architecture,
but I did not test that). The gnu m4 command ignores "-B NUM", which only
exists for compatibility with SysV m4. The NetBSD m4 command does not support
the argument at all and fails, which causes the build to fail.

Since this is either fixing a build failure or a no-op (depending on 
architecture), the pkg revision is not bumped.

Martin

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/distinfo,v
retrieving revision 1.144
diff -u -r1.144 distinfo
--- distinfo	22 Jul 2020 20:41:30 -0000	1.144
+++ distinfo	28 Sep 2020 13:21:22 -0000
@@ -6,6 +6,6 @@
 Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
 SHA1 (patch-Configurations_10-main.conf) = d27643187e0b71041f47a9a7c7eec811f7539085
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
-SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
+SHA1 (patch-Configurations_unix-Makefile.tmpl) = cf6b46c6e10e84100beb468bbe6f85c5e62cbe7a
 SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
 SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956
Index: patches/patch-Configurations_unix-Makefile.tmpl
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl,v
retrieving revision 1.2
diff -u -r1.2 patch-Configurations_unix-Makefile.tmpl
--- patches/patch-Configurations_unix-Makefile.tmpl	31 Mar 2020 15:02:31 -0000	1.2
+++ patches/patch-Configurations_unix-Makefile.tmpl	28 Sep 2020 13:21:22 -0000
@@ -2,10 +2,12 @@
 
 Use pkgsrc layout.
 Do not install HTML documentation.
+Avoid -B $NUM argument to m4 (ignored by most m4 implementations, not
+supported by others)
 
---- Configurations/unix-Makefile.tmpl.orig	2020-03-31 14:23:39.098512410 +0000
-+++ Configurations/unix-Makefile.tmpl
-@@ -274,8 +274,9 @@ libdir={- File::Spec::Win32->file_name_i
+--- Configurations/unix-Makefile.tmpl.orig	2020-04-21 14:22:39.000000000 +0200
++++ Configurations/unix-Makefile.tmpl	2020-09-28 15:17:07.747914097 +0200
+@@ -274,8 +274,9 @@
            ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
  {- output_on() if $config{target} !~ /^mingw/; "" -}
  
@@ -16,7 +18,7 @@
  HTMLDIR=$(DOCDIR)/html
  
  # MANSUFFIX is for the benefit of anyone who may want to have a suffix
-@@ -544,54 +545,54 @@ install_sw: install_dev install_engines 
+@@ -544,54 +545,54 @@
  
  uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
  
@@ -100,3 +102,12 @@
  	fi
  
  install_dev: install_runtime_libs
+@@ -1058,7 +1059,7 @@
+           if ($args{generator}->[0] =~ /\.pl$/) {
+               $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator;
+           } elsif ($args{generator}->[0] =~ /\.m4$/) {
+-              $generator = 'm4 -B 8192'.$generator_incs.' '.$generator.' >'
++              $generator = 'm4 '.$generator_incs.' '.$generator.' >'
+           } elsif ($args{generator}->[0] =~ /\.S$/) {
+               $generator = undef;
+           } else {