CVS commit: pkgsrc/databases/unixodbc

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Apr 29 21:32:03 UTC 2025

Modified Files:
        pkgsrc/databases/unixodbc: Makefile

Log Message:
unixodbc: set FORCE_C_STD unconditionally

requested by gdt


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 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.49 pkgsrc/databases/unixodbc/Makefile:1.50
--- pkgsrc/databases/unixodbc/Makefile:1.49     Thu Apr 24 15:05:07 2025
+++ pkgsrc/databases/unixodbc/Makefile  Tue Apr 29 21:32:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2025/04/24 15:05:07 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2025/04/29 21:32:03 tnn Exp $
 
 DISTNAME=      unixODBC-2.3.12
 PKGNAME=       ${DISTNAME:S/ODBC/odbc/}
@@ -25,13 +25,8 @@ PKGCONFIG_OVERRIDE+= DriverManager/odbc.
 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
+USE_CC_FEATURES+=      gnu99   # intptr_t, strdup
+FORCE_C_STD=           gnu99   # fails with gnu23
 
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")