Re: openssl: "architecture lacks an FPU" on Debian 12/armv7

["Sijmen J. Mulder" <ik%sjmulder.nl@localhost>]

Greg Troxel wrote:
> I personally lean to patch.  (And either way, the above URL included.
> I don't really expect them to fix this, as it seems like a judgement
> disagreement even though I 100% sort it to bug.  But, we'll at least
> have it on file.)

Upstream doesn't seem to be receptive.

Here's patch; it patches Configure not to add -march=armv7-a. Builds on
my Pi 2B.


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/distinfo,v
retrieving revision 1.175
diff -u -u -r1.175 distinfo
--- distinfo	5 Jun 2024 07:47:33 -0000	1.175
+++ distinfo	15 Jul 2024 16:05:30 -0000
@@ -4,4 +4,4 @@
 SHA512 (openssl-3.3.1.tar.gz) = d3682a5ae0721748c6b9ec2f1b74d2b1ba61ee6e4c0d42387b5037a56ef34312833b6abb522d19400b45d807dd65cc834156f5e891cb07fbaf69fcf67e1c595d
 Size (openssl-3.3.1.tar.gz) = 18055752 bytes
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = ea9b0a0c8de810362813d84a4f85c5ebdedf9fc6
-SHA1 (patch-util_perl_OpenSSL_config.pm) = 3ba3c23046bf69c7d348b4c1c8c8269d83cfa2b4
+SHA1 (patch-util_perl_OpenSSL_config.pm) = 737295bb389f9027fac2c707c49ebcee84e041b5
Index: patches/patch-util_perl_OpenSSL_config.pm
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/patches/patch-util_perl_OpenSSL_config.pm,v
retrieving revision 1.3
diff -u -u -r1.3 patch-util_perl_OpenSSL_config.pm
--- patches/patch-util_perl_OpenSSL_config.pm	31 May 2024 16:22:21 -0000	1.3
+++ patches/patch-util_perl_OpenSSL_config.pm	15 Jul 2024 16:05:30 -0000
@@ -1,10 +1,13 @@
 $NetBSD: patch-util_perl_OpenSSL_config.pm,v 1.3 2024/05/31 16:22:21 cheusov Exp $
 
-a strategic chomp makes openssl on NetBSD/i386 configure
+ - a strategic chomp makes openssl on NetBSD/i386 configure
+ - fix default platform id (linux-ppc64) for big-endian PowerPC-based
+   Linux
+ - remove -march=armv7-a on Linux/arm[7-9] causing "selected
+   architecture lacks an FPU"
+   https://github.com/openssl/openssl/issues/21630
 
-fix default platform id (linux-ppc64) for big-endian PowerPC-based Linux
-
---- util/perl/OpenSSL/config.pm.orig	2024-04-09 12:12:22.000000000 +0000
+--- util/perl/OpenSSL/config.pm.orig	2024-06-04 12:53:04.000000000 +0000
 +++ util/perl/OpenSSL/config.pm
 @@ -130,6 +130,7 @@ my $guess_patterns = [
        sub {
@@ -45,3 +48,23 @@
        [ 'ppc64le-.*-linux2',      { target => "linux-ppc64le" } ],
        [ 'ppc-.*-linux2',          { target => "linux-ppc" } ],
        [ 'mips64.*-*-linux2',
+@@ -675,9 +654,6 @@ EOF
+         }
+       ],
+       [ 'armv[1-3].*-.*-linux2',  { target => "linux-generic32" } ],
+-      [ 'armv[7-9].*-.*-linux2',  { target => "linux-armv4",
+-                                    cflags => [ '-march=armv7-a' ],
+-                                    cxxflags => [ '-march=armv7-a' ] } ],
+       [ 'arm.*-.*-linux2',        { target => "linux-armv4" } ],
+       [ 'aarch64-.*-linux2',      { target => "linux-aarch64" } ],
+       [ 'sh.*b-.*-linux2',        { target => "linux-generic32",
+@@ -855,9 +831,6 @@ EOF
+       [ '.*-.*-cygwin',
+         sub { return { target => "Cygwin-${MACHINE}" } } ],
+       [ 'x86-.*-android|i.86-.*-android', { target => "android-x86" } ],
+-      [ 'armv[7-9].*-.*-android', { target => "android-armeabi",
+-                                    cflags => [ '-march=armv7-a' ],
+-                                    cxxflags => [ '-march=armv7-a' ] } ],
+       [ 'arm.*-.*-android',       { target => "android-armeabi" } ],
+       [ 'riscv64-.*-android',     { target => "android-riscv64" } ],
+       [ '.*-hpux1.*',