CVS commit: pkgsrc/ham/gnuradio-core

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon May 19 15:00:34 UTC 2025

Modified Files:
        pkgsrc/ham/gnuradio-core: Makefile.common buildlink3.mk

Log Message:
ham/gnuradio-core: Adjust c++17 comments

Upstream says c++17 is required.
Add C11, expected to have zero effect given c++17, per well-hidden upstream cmake code.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/ham/gnuradio-core/Makefile.common
cvs rdiff -u -r1.42 -r1.43 pkgsrc/ham/gnuradio-core/buildlink3.mk

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

Modified files:

Index: pkgsrc/ham/gnuradio-core/Makefile.common
diff -u pkgsrc/ham/gnuradio-core/Makefile.common:1.61 pkgsrc/ham/gnuradio-core/Makefile.common:1.62
--- pkgsrc/ham/gnuradio-core/Makefile.common:1.61       Sun May 18 19:29:32 2025
+++ pkgsrc/ham/gnuradio-core/Makefile.common    Mon May 19 15:00:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.61 2025/05/18 19:29:32 gdt Exp $
+# $NetBSD: Makefile.common,v 1.62 2025/05/19 15:00:34 gdt Exp $
 # used by ham/gnuradio-channels/Makefile
 # used by ham/gnuradio-companion/Makefile
 # used by ham/gnuradio-core/Makefile
@@ -45,9 +45,8 @@ LICENSE=      gnu-gpl-v3
 # These are safely = rather than += because they are only included
 # by split package Makefiles, none of which set the variables.
 USE_LANGUAGES=         c c++
-# Upstream does not document the needed C++ version.  Reported by
-# email on 20250518 because upstream's bugtracker is not accepting
-# account registrations.
+# Upstream has well-hidden cmake settings to require C11 and C++17.
+USE_CC_FEATURES=       c11
 # Experimentally, FORCE_CXX_STD=c++11 fails and =c++17 succeeds, for
 # building gnuradio-core and gr-osmosdr (with gcc10).
 USE_CXX_FEATURES=      c++17

Index: pkgsrc/ham/gnuradio-core/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-core/buildlink3.mk:1.42 pkgsrc/ham/gnuradio-core/buildlink3.mk:1.43
--- pkgsrc/ham/gnuradio-core/buildlink3.mk:1.42 Sun May 18 19:29:32 2025
+++ pkgsrc/ham/gnuradio-core/buildlink3.mk      Mon May 19 15:00:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.42 2025/05/18 19:29:32 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2025/05/19 15:00:34 gdt Exp $
 
 BUILDLINK_TREE+=       gnuradio-core
 
@@ -8,7 +8,11 @@ GNURADIO_CORE_BUILDLINK3_MK:=
 # GNU Radio's header files do not compile in c++11 mode, but do in
 # c++17 mode.  See Makefile.common for status of reporting upstream.
 USE_LANGUAGES+=                c c++
+USE_CC_FEATURES=       c11
 USE_CXX_FEATURES+=     c++17
+# This is not really right, because perhaps GNU Radio is ok in c++20
+# mode, and some other package might build in that mode, but at least
+# gr-osmosdr might build in c++11, which will fail.
 FORCE_CXX_STD=         c++17
 
 BUILDLINK_API_DEPENDS.gnuradio-core+=  gnuradio-core>=3.10.2