[pkgsrc/trunk]: pkgsrc/sysutils/arm-trusted-firmware sysutils/arm-trusted-fir...

[rhialto <rhialto%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/470a06a602ae
branches:  trunk
changeset: 372725:470a06a602ae
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sat Jan 29 14:03:13 2022 +0000

description:
sysutils/arm-trusted-firmware: add patch to avoid build failure on warnings.

No version bump needed: if it built for you before, there is no change.

diffstat:

 sysutils/arm-trusted-firmware/distinfo               |   3 +-
 sysutils/arm-trusted-firmware/patches/patch-Makefile |  31 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 9d4fdf33c757 -r 470a06a602ae sysutils/arm-trusted-firmware/distinfo
--- a/sysutils/arm-trusted-firmware/distinfo    Sat Jan 29 13:35:57 2022 +0000
+++ b/sysutils/arm-trusted-firmware/distinfo    Sat Jan 29 14:03:13 2022 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:19:20 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/01/29 14:04:46 rhialto Exp $
 
 BLAKE2s (arm-trusted-firmware-2.3.zip) = e71fdc0caab2b5b576c6b7278636c32adf8416ca5bcb22d0903376b4fb543c98
 SHA512 (arm-trusted-firmware-2.3.zip) = 1ee358fef1a4cda68d01857d3c822034b3ab1cc68918c7a4087e95f3f2b9b41a12431a8091847f5897ae9a403826d8fcfde0a8a689c69808ff06e737a845db28
 Size (arm-trusted-firmware-2.3.zip) = 5797101 bytes
+SHA1 (patch-Makefile) = 63a6bf493518b321ac6d6c747025811db6a95b1d
 SHA1 (patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h) = 214c137847cf93661be0f6179882b63aa4aed4fe
diff -r 9d4fdf33c757 -r 470a06a602ae sysutils/arm-trusted-firmware/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/arm-trusted-firmware/patches/patch-Makefile      Sat Jan 29 14:03:13 2022 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-Makefile,v 1.1 2022/01/29 14:03:13 rhialto Exp $
+
+Avoid that we fail on these warnings:
+
+  LD      build/sun50i_a64/release/bl31/bl31.elf
+/usr/pkg/cross-aarch64-none-elf/bin/aarch64-none-elf-ld: skipping incompatible /usr/pkg/lib/libfdt.so when searching for -lfdt
+/usr/pkg/cross-aarch64-none-elf/bin/aarch64-none-elf-ld: skipping incompatible /usr/pkg/lib/libfdt.a when searching for -lfdt
+/usr/pkg/cross-aarch64-none-elf/bin/aarch64-none-elf-ld: skipping incompatible /usr/lib/libc.so when searching for -lc
+/usr/pkg/cross-aarch64-none-elf/bin/aarch64-none-elf-ld: skipping incompatible /usr/lib/libc.a when searching for -lc
+gmake: *** [Makefile:1071: build/sun50i_a64/release/bl31/bl31.elf] Error 1
+
+--- Makefile.orig      2020-04-20 15:56:43.000000000 +0000
++++ Makefile
+@@ -375,7 +375,7 @@ TF_LDFLAGS         +=      $(TF_LDFLAGS_$(ARCH))
+ # LD = gcc (used when GCC LTO is enabled)
+ else ifneq ($(findstring gcc,$(notdir $(LD))),)
+ # Pass ld options with Wl or Xlinker switches
+-TF_LDFLAGS            +=      -Wl,--fatal-warnings -O1
++TF_LDFLAGS            +=      -O1
+ TF_LDFLAGS            +=      -Wl,--gc-sections
+ ifeq ($(ENABLE_LTO),1)
+       ifeq (${ARCH},aarch64)
+@@ -392,7 +392,7 @@ TF_LDFLAGS         +=      $(subst --,-Xlinker --,$(
+ 
+ # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other
+ else
+-TF_LDFLAGS            +=      --fatal-warnings -O1
++TF_LDFLAGS            +=      -O1
+ TF_LDFLAGS            +=      --gc-sections
+ # ld.lld doesn't recognize the errata flags,
+ # therefore don't add those in that case