CVS commit: pkgsrc/security/openssl

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Tue Sep 29 05:45:04 UTC 2020

Modified Files:
        pkgsrc/security/openssl: distinfo
        pkgsrc/security/openssl/patches:
            patch-Configurations_unix-Makefile.tmpl

Log Message:
Fix the build on sparc64 (and other architectures that use m4 to generate
asm files).


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl

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

Modified files:

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.144 pkgsrc/security/openssl/distinfo:1.145
--- pkgsrc/security/openssl/distinfo:1.144      Wed Jul 22 20:41:30 2020
+++ pkgsrc/security/openssl/distinfo    Tue Sep 29 05:45:04 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.144 2020/07/22 20:41:30 sjmulder Exp $
+$NetBSD: distinfo,v 1.145 2020/09/29 05:45:04 martin Exp $
 
 SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
 RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
@@ -6,6 +6,6 @@ SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b
 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: pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl
diff -u pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.2 pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.3
--- pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl:1.2 Tue Mar 31 15:02:31 2020
+++ pkgsrc/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl     Tue Sep 29 05:45:04 2020
@@ -1,11 +1,13 @@
-$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.2 2020/03/31 15:02:31 sevan Exp $
+$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.3 2020/09/29 05:45:04 martin Exp $
 
 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 @@ Do not install HTML documentation.
  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 @@ Do not install HTML documentation.
        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 {