[pkgsrc/trunk]: pkgsrc various fixes for arm64 big endian support.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc various fixes for arm64 big endian support.
From: mrg <mrg%pkgsrc.org@localhost>
Date: Sun, 25 Apr 2021 09:24:15 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/825c348c73ab
branches:  trunk
changeset: 451278:825c348c73ab
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Sun Apr 25 07:51:24 2021 +0000

description:
various fixes for arm64 big endian support.

most of these simply extend matching from "aarch64" to "aarch64eb"
in various forms of code.  most remaining uses in pkgsrc of
"MACHINE_ARCH == aarch64" are because of missing aarch64eb support,
such as most of the binary-bootstrap requiring languages like rust,
go, and java.

no pkg-bump because this shouldn't change packages on systems that
could already build all of these.

diffstat:

 audio/mpg123/options.mk                                      |   4 +-
 audio/speexdsp/Makefile                                      |   6 +++-
 biology/vsearch/Makefile                                     |   4 +-
 emulators/libretro-parallel-n64/Makefile                     |   4 +-
 games/ioquake3/distinfo                                      |   4 +-
 games/ioquake3/patches/patch-ac                              |  13 +++++++----
 graphics/MesaLib/Makefile                                    |   4 +-
 graphics/exiv2/distinfo                                      |   4 +-
 graphics/exiv2/patches/patch-cmake_compilerFlags.cmake       |   4 +-
 graphics/graphviz/distinfo                                   |   4 +-
 graphics/graphviz/patches/patch-configure                    |   5 ++-
 lang/clisp/Makefile                                          |   4 +-
 math/lp_solve/Makefile                                       |   4 +-
 mk/compiler/gfortran.mk                                      |   4 +-
 mk/platform/NetBSD.mk                                        |   8 ++++--
 multimedia/libaom/Makefile                                   |   4 +-
 news/nn/Makefile                                             |   4 +-
 parallel/threadingbuildingblocks/distinfo                    |   4 +-
 parallel/threadingbuildingblocks/patches/patch-build-BSD.inc |   7 ++++-
 sysutils/dmidecode/Makefile                                  |   4 +-
 sysutils/estd/Makefile                                       |   4 +-
 x11/matchbox-panel/Makefile                                  |   4 +-
 x11/modular-xorg-server/distinfo                             |   4 +-
 x11/modular-xorg-server/patches/patch-configure              |   4 +-
 24 files changed, 63 insertions(+), 52 deletions(-)

diffs (truncated from 454 to 300 lines):

diff -r 31e0023e3fa1 -r 825c348c73ab audio/mpg123/options.mk
--- a/audio/mpg123/options.mk   Sun Apr 25 07:50:24 2021 +0000
+++ b/audio/mpg123/options.mk   Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2021/03/15 18:25:21 dholland Exp $
+# $NetBSD: options.mk,v 1.10 2021/04/25 07:51:24 mrg Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mpg123
 PKG_OPTIONS_OPTIONAL_GROUPS=   fpu
@@ -8,7 +8,7 @@
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE_CPU} == "aarch64"
 PKG_OPTIONS_GROUP.fpu+=                mpg123-neon64 mpg123-aarch64
 PKG_SUGGESTED_OPTIONS+=                mpg123-aarch64
 .elif ${MACHINE_ARCH} == "powerpc"
diff -r 31e0023e3fa1 -r 825c348c73ab audio/speexdsp/Makefile
--- a/audio/speexdsp/Makefile   Sun Apr 25 07:50:24 2021 +0000
+++ b/audio/speexdsp/Makefile   Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/06/11 11:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=      speexdsp-1.2.0
 CATEGORIES=    audio
@@ -14,7 +14,9 @@
 PKGCONFIG_OVERRIDE=    speexdsp.pc.in
 USE_TOOLS+=            pkg-config
 
-.if ${MACHINE_ARCH} == "aarch64"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_CPU} == "aarch64"
 CONFIGURE_ARGS+=       --disable-neon
 .endif
 
diff -r 31e0023e3fa1 -r 825c348c73ab biology/vsearch/Makefile
--- a/biology/vsearch/Makefile  Sun Apr 25 07:50:24 2021 +0000
+++ b/biology/vsearch/Makefile  Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/05/11 14:27:18 bacon Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=      vsearch-2.13.4
 CATEGORIES=    biology
@@ -11,7 +11,7 @@
 LICENSE=       gnu-gpl-v3
 
 # Works on powerpc64, but only in little endian mode
-ONLY_FOR_PLATFORM=     *-*-aarch64 *-*-x86_64
+ONLY_FOR_PLATFORM=     *-*-aarch64* *-*-x86_64
 
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            autoconf automake autoreconf gmake
diff -r 31e0023e3fa1 -r 825c348c73ab emulators/libretro-parallel-n64/Makefile
--- a/emulators/libretro-parallel-n64/Makefile  Sun Apr 25 07:50:24 2021 +0000
+++ b/emulators/libretro-parallel-n64/Makefile  Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/12/31 20:04:11 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=      libretro-parallel-n64-20200528
 CATEGORIES=    emulators
@@ -19,7 +19,7 @@
 MAKE_FLAGS+=   WITH_DYNAREC=x86
 .elif ${MACHINE_ARCH} == "x86_64"
 MAKE_FLAGS+=   WITH_DYNAREC=x86_64
-.elif ${MACHINE_ARCH} == "aarch64"
+.elif ${MACHINE_CPU} == "aarch64"
 MAKE_FLAGS+=   WITH_DYNAREC=aarch64
 MAKE_FLAGS+=   HAVE_NEON=0
 CFLAGS+=       -DNO_ASM -DARM_FIX
diff -r 31e0023e3fa1 -r 825c348c73ab games/ioquake3/distinfo
--- a/games/ioquake3/distinfo   Sun Apr 25 07:50:24 2021 +0000
+++ b/games/ioquake3/distinfo   Sun Apr 25 07:51:24 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2020/01/25 20:13:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.9 2021/04/25 07:51:26 mrg Exp $
 
 SHA1 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 791bc69ea853ced457134ed4759a76b40cd0e008
 RMD160 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 10c18309b358b0b091073f96c3ddaeb7c1535aa5
 SHA512 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 
689a0efa6eaf88fcf98616c100df625b77617c55e351455cc25727fea525748855c58e2288f04d86372d392a556f2ef4926e2c808f75e104ac328baa9458c4d1
 Size (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 7691640 bytes
 SHA1 (patch-aa) = b146df4f36fc7f9e0bfece50bd154c24e507dc2f
-SHA1 (patch-ac) = dc32068082c3493eb503811c2577b8fadb2745d3
+SHA1 (patch-ac) = 93f78831bf301a52d2235a004bab7c1d335f3dc0
 SHA1 (patch-code_tools_lcc_cpp_unix.c) = e80699461d92b9a659c88c0f5d66580ecf237f5f
diff -r 31e0023e3fa1 -r 825c348c73ab games/ioquake3/patches/patch-ac
--- a/games/ioquake3/patches/patch-ac   Sun Apr 25 07:50:24 2021 +0000
+++ b/games/ioquake3/patches/patch-ac   Sun Apr 25 07:51:24 2021 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2020/01/25 20:13:49 jmcneill Exp $
+$NetBSD: patch-ac,v 1.5 2021/04/25 07:51:26 mrg Exp $
 
---- Makefile.orig      2019-12-07 13:16:15.000000000 +0000
-+++ Makefile
-@@ -11,6 +11,13 @@ ifeq ($(COMPILE_PLATFORM),sunos)
+--- Makefile.orig      2019-12-07 05:16:15.000000000 -0800
++++ Makefile   2021-04-24 18:01:14.100897227 -0700
+@@ -11,6 +11,16 @@
    COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/')
  endif
  
@@ -11,12 +11,15 @@
 +  ifeq ($(COMPILE_CPU),aarch64)
 +    COMPILE_ARCH=$(COMPILE_CPU)
 +  endif
++  ifeq ($(COMPILE_CPU),aarch64eb)
++    COMPILE_ARCH=aarch64
++  endif
 +endif
 +
  ifndef BUILD_STANDALONE
    BUILD_STANDALONE =
  endif
-@@ -850,11 +857,38 @@ ifeq ($(PLATFORM),netbsd)
+@@ -850,11 +860,38 @@
  
    BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
  
diff -r 31e0023e3fa1 -r 825c348c73ab graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Sun Apr 25 07:50:24 2021 +0000
+++ b/graphics/MesaLib/Makefile Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2021/04/12 12:40:01 nia Exp $
+# $NetBSD: Makefile,v 1.197 2021/04/25 07:51:26 mrg Exp $
 
 DISTNAME=      mesa-20.0.6
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -57,7 +57,7 @@
 .  endif
 PLIST.kms=             yes
 .  if !empty(MACHINE_ARCH:M*arm*) || \
-      ${MACHINE_ARCH} == "aarch64"
+      ${MACHINE_CPU} == "aarch64"
 # ARM Mali Utgard
 GALLIUM_DRIVERS+=      lima
 PLIST.lima=            yes
diff -r 31e0023e3fa1 -r 825c348c73ab graphics/exiv2/distinfo
--- a/graphics/exiv2/distinfo   Sun Apr 25 07:50:24 2021 +0000
+++ b/graphics/exiv2/distinfo   Sun Apr 25 07:51:24 2021 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.35 2020/10/20 07:07:23 tnn Exp $
+$NetBSD: distinfo,v 1.36 2021/04/25 07:51:26 mrg Exp $
 
 SHA1 (exiv2-0.27.3-Source.tar.gz) = f31a74793ce2cd0161915ed1fbec8e79c31cd54d
 RMD160 (exiv2-0.27.3-Source.tar.gz) = 7e3ce6de75aaf87b46d419f86b4b0fc55f133234
 SHA512 (exiv2-0.27.3-Source.tar.gz) = 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
 Size (exiv2-0.27.3-Source.tar.gz) = 26447901 bytes
-SHA1 (patch-cmake_compilerFlags.cmake) = 5b33099de101b47ac6750bb3e62d2169a13f0a8c
+SHA1 (patch-cmake_compilerFlags.cmake) = 5123ad4273c213e7680288ac3919b6cc5f2748d0
 SHA1 (patch-cmake_config.h.cmake) = b7e0336e5ca55a9df08958a05d8ac2a2c800e836
 SHA1 (patch-contrib_organize_Makefile) = 27348fdb0f80092b6e16f27e3ac1dca988eefe70
 SHA1 (patch-contrib_organize_helpers.cpp) = ec003c826d463b3e7e571ab4c41baffaca1240e9
diff -r 31e0023e3fa1 -r 825c348c73ab graphics/exiv2/patches/patch-cmake_compilerFlags.cmake
--- a/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake    Sun Apr 25 07:50:24 2021 +0000
+++ b/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake    Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_compilerFlags.cmake,v 1.2 2020/10/20 07:07:24 tnn Exp $
+$NetBSD: patch-cmake_compilerFlags.cmake,v 1.3 2021/04/25 07:51:26 mrg Exp $
 
 Gcc on some platforms does not support -fcf-protection.
 
@@ -9,7 +9,7 @@
          # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
          if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
 -            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
-+            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0 AND NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sparc.*|aarch64"))
++            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0 AND NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sparc.*|aarch64.*"))
                  add_compile_options(-fstack-clash-protection -fcf-protection)
              endif()
  
diff -r 31e0023e3fa1 -r 825c348c73ab graphics/graphviz/distinfo
--- a/graphics/graphviz/distinfo        Sun Apr 25 07:50:24 2021 +0000
+++ b/graphics/graphviz/distinfo        Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2020/07/27 20:44:15 adam Exp $
+$NetBSD: distinfo,v 1.65 2021/04/25 07:51:26 mrg Exp $
 
 SHA1 (graphviz-2.44.1.tar.gz) = 2cda62953bd84b945c4ae4fe7067da9cb26fc937
 RMD160 (graphviz-2.44.1.tar.gz) = 936275110c362ca17239d8084c452f6d1731cacf
@@ -7,7 +7,7 @@
 SHA1 (patch-cmd_gvmap_gvmap.sh) = a6047ffe825cf13271b556ba8c4f3c866d04f5c3
 SHA1 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5
 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
-SHA1 (patch-configure) = ce1f7daf5189dabd236e55c5302918b119a23946
+SHA1 (patch-configure) = cbe042e0c92b5db69b565be9a3a4147b65c9590c
 SHA1 (patch-iffe) = f32c6be65209e57a92c215dee25c5c8334142c03
 SHA1 (patch-lib_gvc_Makefile.in) = f469c2dc53cf9af5b1e86f5da04bf9575685bd41
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = b5b46a1e7dc52f163526c5b8b7e1b893d5500e3c
diff -r 31e0023e3fa1 -r 825c348c73ab graphics/graphviz/patches/patch-configure
--- a/graphics/graphviz/patches/patch-configure Sun Apr 25 07:50:24 2021 +0000
+++ b/graphics/graphviz/patches/patch-configure Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.8 2020/07/27 20:44:15 adam Exp $
+$NetBSD: patch-configure,v 1.9 2021/04/25 07:51:26 mrg Exp $
 
 1. chunk: fix
 ./configure.lineno: 1: Syntax error: Bad substitution
@@ -33,7 +33,8 @@
 @@ -3387,7 +3394,6 @@ if test -z "$LIBPOSTFIX"; then
      *linux* )
        case "${host_cpu}" in
-         aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 )
+-        aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 )
++        aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 )
 -          LIBPOSTFIX="64"
            INTGOSIZE=64
            ;;
diff -r 31e0023e3fa1 -r 825c348c73ab lang/clisp/Makefile
--- a/lang/clisp/Makefile       Sun Apr 25 07:50:24 2021 +0000
+++ b/lang/clisp/Makefile       Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2020/03/08 16:50:19 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=              clisp-2.49
 PKGREVISION=           27
@@ -13,7 +13,7 @@
 
 # XXX: is this still current?
 BROKEN_ON_PLATFORM+=   *-*-arm
-BROKEN_ON_PLATFORM+=   *-*-aarch64
+BROKEN_ON_PLATFORM+=   *-*-aarch64*
 # makes the bulk build hang under MirBSD
 BROKEN_ON_PLATFORM+=   MirBSD-*-*
 
diff -r 31e0023e3fa1 -r 825c348c73ab math/lp_solve/Makefile
--- a/math/lp_solve/Makefile    Sun Apr 25 07:50:24 2021 +0000
+++ b/math/lp_solve/Makefile    Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/03/20 11:58:00 nia Exp $
+# $NetBSD: Makefile,v 1.14 2021/04/25 07:51:25 mrg Exp $
 #
 
 DISTNAME=      lp_solve_5.5.2.3_source
@@ -28,7 +28,7 @@
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" || \
-       ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64"
+       ${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"
 LPSOLVE_ARCH=  ux64
 .else
 LPSOLVE_ARCH=  ux32
diff -r 31e0023e3fa1 -r 825c348c73ab mk/compiler/gfortran.mk
--- a/mk/compiler/gfortran.mk   Sun Apr 25 07:50:24 2021 +0000
+++ b/mk/compiler/gfortran.mk   Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.16 2020/10/20 19:35:07 tnn Exp $
+# $NetBSD: gfortran.mk,v 1.17 2021/04/25 07:51:25 mrg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,7 +42,7 @@
 POSSIBLE_GFORTRAN_VERSION?=    ${CC_VERSION:S/gcc-//:C/.[0-9].[0-9]$//}
 
 # gcc9 doesn't work on NetBSD/aarch64, but gcc10 does.
-.if !empty(POSSIBLE_GFORTRAN_VERSION:M9) && !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
+.if !empty(POSSIBLE_GFORTRAN_VERSION:M9) && !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
 POSSIBLE_GFORTRAN_VERSION=     10
 .endif
 
diff -r 31e0023e3fa1 -r 825c348c73ab mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Sun Apr 25 07:50:24 2021 +0000
+++ b/mk/platform/NetBSD.mk     Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.64 2020/12/20 20:22:17 maya Exp $
+# $NetBSD: NetBSD.mk,v 1.65 2021/04/25 07:51:25 mrg Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -137,14 +137,16 @@
 # Register support for PIE on supported architectures (with GCC)
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "aarch64")
+    (${MACHINE_ARCH} == "aarch64") || \
+    (${MACHINE_ARCH} == "aarch64eb")
 _OPSYS_SUPPORTS_MKPIE= yes
 .endif
 
 # Register support for RELRO on supported architectures
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "aarch64")
+    (${MACHINE_ARCH} == "aarch64") || \
+    (${MACHINE_ARCH} == "aarch64eb")
 _OPSYS_SUPPORTS_RELRO= yes
 .endif
 
diff -r 31e0023e3fa1 -r 825c348c73ab multimedia/libaom/Makefile
--- a/multimedia/libaom/Makefile        Sun Apr 25 07:50:24 2021 +0000
+++ b/multimedia/libaom/Makefile        Sun Apr 25 07:51:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/12/23 15:03:09 gdt Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/25 07:51:25 mrg Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/zzuf zzuf: disable FORTIFY to fix build
Next by Date: [pkgsrc/trunk]: pkgsrc/emulators/caprice32 caprice32: fix building wiht gcc10
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/zzuf zzuf: disable FORTIFY to fix build
Next by Thread: [pkgsrc/trunk]: pkgsrc/emulators/caprice32 caprice32: fix building wiht gcc10
Indexes:
Home | Main Index | Thread Index | Old Index