CVS commit: pkgsrc/databases/unixodbc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Apr 24 15:05:07 UTC 2025

Modified Files:
        pkgsrc/databases/unixodbc: Makefile

Log Message:
unixodbc: fix build w/ GCC 15

Has multiple issues with function pointer abuse. It is less intrusive
to reduce the standard than to patch everything here.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/databases/unixodbc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/unixodbc/Makefile
diff -u pkgsrc/databases/unixodbc/Makefile:1.48 pkgsrc/databases/unixodbc/Makefile:1.49
--- pkgsrc/databases/unixodbc/Makefile:1.48     Mon Aug  5 13:25:42 2024
+++ pkgsrc/databases/unixodbc/Makefile  Thu Apr 24 15:05:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2024/08/05 13:25:42 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2025/04/24 15:05:07 tnn Exp $
 
 DISTNAME=      unixODBC-2.3.12
 PKGNAME=       ${DISTNAME:S/ODBC/odbc/}
@@ -26,6 +26,13 @@ PKGCONFIG_OVERRIDE+= cur/odbccr.pc.in
 PKGCONFIG_OVERRIDE+=   odbcinst/odbcinst.pc.in
 PTHREAD_OPTS+=         require
 
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:Mgcc-15)
+# This should be FORCE_C_STD, but we already included compiler.mk.
+CFLAGS+=               -std=gnu17 # reduced from gnu23
+.endif
+
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
 CONFIGURE_ARGS+=       --enable-gnuthreads