<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6b3fd50fa49ae79d637036a34608e67056e1792f">https://github.com/macports/macports-ports/commit/6b3fd50fa49ae79d637036a34608e67056e1792f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6b3fd50fa49 flashrom: Fix build on 10.7-10.12.
</span>6b3fd50fa49 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6b3fd50fa49ae79d637036a34608e67056e1792f
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Thu Nov 16 18:03:36 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> flashrom: Fix build on 10.7-10.12.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This constrains the compiler to one that doesn't complain about
</span><span style='display:block; white-space:pre;color:#404040;'> missing field initializers. Unreleased upstream changes are fixing
</span><span style='display:block; white-space:pre;color:#404040;'> such issues in the code itself, so this fix should be temporary. This
</span><span style='display:block; white-space:pre;color:#404040;'> change is insufficient for 10.6-, though upstream also seems to be
</span><span style='display:block; white-space:pre;color:#404040;'> fixing some issues for 10.6 and 10.5 (including PPC).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The former "revert the upstream change" patch was rendered unnecessary
</span><span style='display:block; white-space:pre;color:#404040;'> by this change, and should remain so after the next upstream release.
</span><span style='display:block; white-space:pre;color:#404040;'> It actually should have been rendered unnecessary by 545ec750aa2, but
</span><span style='display:block; white-space:pre;color:#404040;'> apparently the build procedure still builds ich_descriptors, even with
</span><span style='display:block; white-space:pre;color:#404040;'> CONFIG_INTERNAL_X86=0.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Removing that patch is not expected to change the content of successful
</span><span style='display:block; white-space:pre;color:#404040;'> builds, hence no revbump is needed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also adds note to Portfile about trace mode.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built, ran tests, and ran with CH341A USB programmer on 10.7-10.15
</span><span style='display:block; white-space:pre;color:#404040;'> x86_64 and 11.x-14.x arm64.
</span>---
sysutils/flashrom/Portfile | 17 +++++++++++++++--
.../files/patch-ich_descriptors_tool.c.patch | 21 ---------------------
2 files changed, 15 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/flashrom/Portfile b/sysutils/flashrom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6b3ee9513a..759b3e4515e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/flashrom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/flashrom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name flashrom
version 1.3.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +23,23 @@ checksums rmd160 760f21c1580c910304583777304de664d6ae1aad \
</span> size 489782
revision 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# revert the upstream patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ich_descriptors_tool.c.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Blacklist compilers that have issues with missing initializer fields.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This applies to clang < 10.x. The equivalent gcc version is unknown,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# so we blacklist all gccs with no loss of generality, since the only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# systems where Xcode uses gcc don't work for other reasons.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This will probably become unnecessary after the next upstream release,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which is also adding fixes for 10.5 adn 10.6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This fix is sufficient for 10.7-10.12, and a NOP on 10.13+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist *gcc* {clang < 1000}
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: The build procedure tests for pci.h and libpci, even though all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# programmers that would use libpci are disabled in this build. Thus,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# any such references seen in trace mode can be ignored.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:libftdi1 \
port:libusb-compat
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/flashrom/files/patch-ich_descriptors_tool.c.patch b/sysutils/flashrom/files/patch-ich_descriptors_tool.c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fb72d119150..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/flashrom/files/patch-ich_descriptors_tool.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From df4905822754ac1f303f7939f5b77b35e5ac4a67 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Richard Hughes <richard@hughsie.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 19 Dec 2018 11:57:15 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix several -Wno-missing-field-initializers warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ib4487d4c1a38fa8471fa1f9034604412e9d14cf7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Richard Hughes <richard@hughsie.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-on: https://review.coreboot.org/c/30405
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Nico Huber <nico.h@gmx.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/ich_descriptors_tool/ich_descriptors_tool.c.orig 2019-10-04 09:35:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/ich_descriptors_tool/ich_descriptors_tool.c 2023-03-06 03:05:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,7 +152,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *fn = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *csn = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum ich_chipset cs = CHIPSET_ICH_UNKNOWN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct ich_descriptors desc = { 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct ich_descriptors desc = {{ 0 }};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while ((opt = getopt(argc, argv, "df:c:")) != -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (opt) {
</span></pre><pre style='margin:0'>
</pre>