[LON-CAPA-cvs] cvs: capa /capa51/pProj Makefile loncom/homework/caparesponse Makefile.PL

[raeburn]

raeburn		Thu Oct 30 22:13:39 2025 EDT

  Modified files:              
    /loncom/homework/caparesponse	Makefile.PL 
    /capa/capa51/pProj	Makefile 
  Log:
  - Support Fedora 43 which uses gcc 15 (for which default is C23 standard) by
    including -std=gnu17 in compiler flags for compatibility with CAPA code. 
  
  
Index: loncom/homework/caparesponse/Makefile.PL
diff -u loncom/homework/caparesponse/Makefile.PL:1.14 loncom/homework/caparesponse/Makefile.PL:1.15
--- loncom/homework/caparesponse/Makefile.PL:1.14	Mon Apr 29 15:03:33 2024
+++ loncom/homework/caparesponse/Makefile.PL	Thu Oct 30 22:13:38 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # makefile for capa wrapper
 #
-# $Id: Makefile.PL,v 1.14 2024/04/29 15:03:33 raeburn Exp $
+# $Id: Makefile.PL,v 1.15 2025/10/30 22:13:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,9 +39,11 @@
 # you ever wanted to know.
  
 $capadir = "../../../CAPA";
+$gccver = `gcc -dumpversion`;
+chomp($gccver);
 
 use ExtUtils::MakeMaker;
-WriteMakefile(
+my %WriteMakefileArgs = (
      'NAME' => 'capa',            # Name of your module
      'INC' => "-I$capadir/pProj",
      'LIBS' => ["-lfl"], # Custom libraries (if any)
@@ -50,4 +52,8 @@
          OTHERLDFLAGS => '-Wl,--allow-multiple-definition',
       },
      'OBJECT' => 'capa_wrap.o caparesponse.o capaFunctions/*.o'    # Object files
-);     
+);
+if ($gccver == 15) {
+   $WriteMakefileArgs{'CCFLAGS'} = '-std=gnu17';
+}
+WriteMakefile(%WriteMakefileArgs);
Index: capa/capa51/pProj/Makefile
diff -u capa/capa51/pProj/Makefile:1.25 capa/capa51/pProj/Makefile:1.26
--- capa/capa51/pProj/Makefile:1.25	Wed Jul 28 16:28:15 2021
+++ capa/capa51/pProj/Makefile	Thu Oct 30 22:13:38 2025
@@ -72,7 +72,12 @@
 IRIXFLAG=-O2 -DIRIX $(DEF)
 LinuxFLAG=-O2 -Wall $(DEF)
 
-CFLAG=$($(ARCH)FLAG)
+GCCVER = $(shell gcc -dumpversion)
+ifeq ($(GCCVER),15)
+  CCSTD = -std=gnu17
+endif
+
+CFLAG=$(CCSTD) $($(ARCH)FLAG)
 
 PAR_SRC = capaLexerFun.c capaParserFun.c capaFormulaParser.c capaFunction.c \
 	  capaParserUtils.c capaMapExpr.c capaUnit.c com.c linpack.c ranlib.c \