git: a6a666b6946d - main - sysutils/superiotool: fix build after pci after libpci 3.14.0 update

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Andriy Gapon <avg_at_FreeBSD.org>
Date: Wed, 02 Jul 2025 07:53:53 UTC

The branch main has been updated by avg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a6a666b6946de9ce50f927c7a7bc1c15f2a9c5e6

commit a6a666b6946de9ce50f927c7a7bc1c15f2a9c5e6
Author:     Andriy Gapon <avg@FreeBSD.org>
AuthorDate: 2025-07-02 07:47:19 +0000
Commit:     Andriy Gapon <avg@FreeBSD.org>
CommitDate: 2025-07-02 07:53:04 +0000

    sysutils/superiotool: fix build after pci after libpci 3.14.0 update
    
    The libpci update introduced a C++ style comment ('//') into a header file.
    superiotool uses very strict compilation flags (including -ansi), so its
    build started to fail with:
      /usr/local/include/pci/header.h:1691:45: error: // comments are not
      allowed in this language [-Werror,-Wcomment]
    Fix the problem by adding -Wno-comment exemption.
---
 sysutils/superiotool/files/patch-Makefile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/sysutils/superiotool/files/patch-Makefile b/sysutils/superiotool/files/patch-Makefile
index a17b198c05b8..a7cca296f4ed 100644
--- a/sysutils/superiotool/files/patch-Makefile
+++ b/sysutils/superiotool/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2022-10-16 20:14:31 UTC
-+++ Makefile
-@@ -8,7 +8,7 @@ PREFIX  ?= /usr/local
+--- Makefile.orig	2022-10-16 23:14:31.000000000 +0300
++++ Makefile	2025-07-02 10:37:44.757402000 +0300
+@@ -8,7 +8,7 @@
  
  # Set the superiotool version string to the output of 'git describe'.
  
@@ -9,3 +9,12 @@
  
  CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
           -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
+@@ -23,7 +23,7 @@
+ endif
+ ifeq ($(OS_ARCH), FreeBSD)
+ CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+-         -Werror-implicit-function-declaration -ansi $(VERSION) \
++         -Werror-implicit-function-declaration -Wno-comment -ansi $(VERSION) \
+          -I/usr/local/include
+ LDFLAGS += -L/usr/local/lib
+ LIBS = -lz