Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jun 2023 07:18:16 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7e55bfd508b9 - main - net-mgmt/ipv6calc: Fix build with Clang 15 and remove the workaround
Message-ID:  <202306300718.35U7IG8B064793@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

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

commit 7e55bfd508b9e90a08978d6bded5b63124f86284
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-06-30 07:02:08 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-06-30 07:02:08 +0000

    net-mgmt/ipv6calc: Fix build with Clang 15 and remove the workaround
    
    libipv6calc_db_wrapper.c:2901:23: error: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
                            ret = get_array_row(i, &value_first_00_31, &value_first_32_63, &value_last_00_31, &value_last_32_63);
                                               ^
    1 error generated.
---
 net-mgmt/ipv6calc/Makefile            |  8 +-------
 net-mgmt/ipv6calc/files/patch-clang15 | 11 +++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 0f603565f941..656913f69c61 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -20,13 +20,7 @@ GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	tools/*
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000) || ${OSVERSION} >= 1400079)
-CFLAGS+=       -Wno-error=deprecated-non-prototype
-.endif
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/ipv6calc/files/patch-clang15 b/net-mgmt/ipv6calc/files/patch-clang15
new file mode 100644
index 000000000000..561ba8c5dd68
--- /dev/null
+++ b/net-mgmt/ipv6calc/files/patch-clang15
@@ -0,0 +1,11 @@
+--- databases/lib/libipv6calc_db_wrapper.c.orig	2023-06-12 07:11:54 UTC
++++ databases/lib/libipv6calc_db_wrapper.c
+@@ -2778,7 +2778,7 @@ long int libipv6calc_db_wrapper_get_entry_generic(
+ 	const uint32_t	lookup_key_00_31,	// lookup key MSB
+ 	const uint32_t	lookup_key_32_63,	// lookup key LSB
+ 	void            *data_ptr,		// pointer to DB data in case of IPV6CALC_DB_LOOKUP_DATA_PTR_TYPE_BDB, otherwise NULL
+-	int  (*get_array_row)()			// function to get array row
++	int  (*get_array_row)(int, uint32_t*, uint32_t*, uint32_t*, uint32_t*)		// function to get array row
+ 	) {
+ 
+ 	int retval = -1;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306300718.35U7IG8B064793>