Merge pull request #262 from JeffersonLab/aaust_almalinux9

Aaust almalinux9

Author: aaust

Makefile_diracxx

@@ -69,17 +69,23 @@ $(DIRACXX_HOME)/.untar_done: $(TARFILE)
 	rmdir -v $(UNTAR_TEMP_DIR)
 	date > $@
 
+$(DIRACXX_HOME)/.patch_done: $(SOURCE_CODE_TARGET)
+	cd $(DIRACXX_HOME); \
+	patch -p1 < ${BUILD_SCRIPTS}/patches/diracxx/diracxx_c++11.patch
+	date > $@
+
 $(DIRACXX_HOME)/.make_done: $(SOURCE_CODE_TARGET)
 	cd $(DIRACXX_HOME) ; \
 	make PYTHON_CONFIG=$(PYTHON_CONFIG) BOOST_PYTHON_LIB=$(PYTHON_BOOST) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) $(DIRACXX_MAKE_OPTIONS)
 	date > $@
 
-$(DIRACXX_HOME)/.cmake_done: $(SOURCE_CODE_TARGET)
+$(DIRACXX_HOME)/.cmake_done: $(DIRACXX_HOME)/.patch_done
 	cd $(DIRACXX_HOME); \
 	mkdir -p build; \
 	cd build; \
 	$(CMAKE3) -DCMAKE_INSTALL_PREFIX=$(DIRACXX_HOME) \
-	    -DPYTHON_WITH_VERSION=$(PYTHON_BOOST_CMAKE) \
+	    -DCMAKE_INSTALL_LIBDIR=$(DIRACXX_HOME)/lib \
+	    -DBoost_NO_BOOST_CMAKE=ON \
 	    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ..
 	date > $@
 

Makefile_hdgeant4

@@ -31,6 +31,14 @@ PYTHON_CONFIG = $(shell $(BUILD_SCRIPTS)/python_chooser.sh config)
 PYTHON_BOOST = $(shell $(BUILD_SCRIPTS)/python_chooser.sh boost)
 PYTHON_LIB_OPTION = $(shell $(BUILD_SCRIPTS)/python_chooser.sh lib)
 
+PYTHON_MAJOR_VERSION = $(shell $(BUILD_SCRIPTS)/python_chooser.sh version)
+PYTHON_MINOR_VERSION = $(shell $(BUILD_SCRIPTS)/python_chooser.sh minor)
+ifeq '$(PYTHON_MAJOR_VERSION)' '3'
+     PYTHON_GE_3 = true
+else
+     PYTHON_GE_3 = false
+endif
+
 QTHOME_LOCATION := $(shell if [ -d  "/usr/lib64/qt5" ]; then echo /usr/lib64/qt5; elif [ -d  "/usr/lib64/qt4" ]; then echo /usr/lib64/qt4; else echo not_found; fi)
 ifneq ($(QTHOME_LOCATION), not_found)
   QTHOME_DEF = QTHOME=$(QTHOME_LOCATION)
@@ -67,13 +75,21 @@ $(HDGEANT4_HOME)/.link_to_fixes_done: $(SOURCE_CODE_TARGET)
 	cd $(HDGEANT4_HOME)/src ; ln -s G4.$(GEANT4_VERSION)fixes G4fixes 
 	date > $@
 
-$(HDGEANT4_HOME)/.make_done: $(HDGEANT4_HOME)/.link_to_fixes_done
+$(HDGEANT4_HOME)/.patch_done: $(HDGEANT4_HOME)/.link_to_fixes_done
+	cd $(HDGEANT4_HOME); \
+	patch -p1 < ${BUILD_SCRIPTS}/patches/hdgeant4/hdgeant4_c++11.patch
+	date > $@
+
+$(HDGEANT4_HOME)/.make_done: $(HDGEANT4_HOME)/.patch_done
 	cd $(HDGEANT4_HOME) ; \
 	if [ -z "$$G4SYSTEM" ] ; \
 	    then echo Geant4 setup not complete, sourcing geant4make.sh ; \
 	    . `find $(G4ROOT)/share/ -name geant4make.sh` ; \
 	fi ; \
-	make PYTHON_CONFIG=$(PYTHON_CONFIG) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) $(QTHOME_DEF) $(HDGEANT4_MAKE_OPTIONS)
+	if $(PYTHON_GE_3) ; \
+	   then make PYTHON_CONFIG=$(PYTHON_CONFIG) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) PYTHON_GE_3=$(PYTHON_GE_3) PYTHON_MAJOR_VERSION=$(PYTHON_MAJOR_VERSION) PYTHON_MINOR_VERSION=$(PYTHON_MINOR_VERSION) $(QTHOME_DEF) $(HDGEANT4_MAKE_OPTIONS) ; \
+	else make PYTHON_CONFIG=$(PYTHON_CONFIG) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) $(QTHOME_DEF) $(HDGEANT4_MAKE_OPTIONS) ; \
+	fi ; \
 	date > $@
 
 $(HDGEANT4_HOME)/hdgeant4_prereqs_version.xml: $(HDGEANT4_HOME)/.make_done

gluex_targets.mk

@@ -61,7 +61,7 @@ endif
 ifdef HALLD_AMP_HOME
     GLUEX_PASS2_TARGETS += halld_amp_build
 endif
-ifdef DIRACXX
+ifdef DIRACXX_HOME
     GLUEX_PASS2_TARGETS += diracxx_build
 endif
 ifdef HALLD_SIM_HOME

patches/diracxx/diracxx_c++11.patch

@@ -0,0 +1,23 @@
+--- Diracxx_original/CMakeLists.txt	2024-01-02 13:52:53.000000000 -0500
++++ Diracxx_patched/CMakeLists.txt	2024-01-02 15:43:53.671650115 -0500
+@@ -5,18 +5,8 @@ project(Diracxx VERSION 1.1 DESCRIPTION
+ configure_file(DiracxxConfig.h.in DiracxxConfig.h)
+ 
+ # specify the C++ standard
+-if(CMAKE_CXX17_STANDARD_COMPILE_OPTION STREQUAL "-std=c++17")
+-  message("compile c++ code with c++17 support")
+-  set(CMAKE_CXX_STANDARD 17)
+-elseif(CMAKE_CXX14_STANDARD_COMPILE_OPTION STREQUAL "-std=c++14")
+-  message("compile c++ code with c++14 support")
+-  set(CMAKE_CXX_STANDARD 14)
+-elseif(CMAKE_CXX11_STANDARD_COMPILE_OPTION STREQUAL "-std=c++11")
+-  message("compile c++ code with c++11 support")
+-  set(CMAKE_CXX_STANDARD 11)
+-else(CMAKE_CXX17_STANDARD_COMPILE_OPTION STREQUAL "-std=c++17")
+-  message("compile c++ code with compiler default std")
+-endif(CMAKE_CXX17_STANDARD_COMPILE_OPTION STREQUAL "-std=c++17")
++message("compile c++ code with c++11 support")
++set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED True)
+ 
+ # require python to be installed

patches/hdgeant4/hdgeant4_c++11.patch

@@ -0,0 +1,21 @@
+--- hdgeant4-2.37.0/GNUmakefile	2023-11-30 12:27:16.000000000 -0500
++++ hdgeant4-2.37.0_patched/GNUmakefile	2023-12-20 12:19:31.476302070 -0500
+@@ -143,16 +143,8 @@ g4fixes: $(G4TMPDIR)/libG4fixes.so
+ CXXFLAGS = -g -O4 -fPIC -W -Wall -pedantic -Wno-non-virtual-dtor -Wno-long-long
+ 
+ GCCVERSION = $(shell gcc --version | awk -F'[. ]*' '/gcc/{print $$3}')
+-ifeq ($(shell test $(GCCVERSION) -ge 8; echo $$?),0)
+-    CPPFLAGS += -std=c++17
+-    CXXFLAGS += -std=c++17
+-else ifeq ($(shell test $(GCCVERSION) -ge 5; echo $$?),0)
+-    CPPFLAGS += -std=c++14
+-    CXXFLAGS += -std=c++14
+-else
+-    CPPFLAGS += -std=c++11
+-    CXXFLAGS += -std=c++11
+-endif
++CPPFLAGS += -std=c++11
++CXXFLAGS += -std=c++11
+ 
+ HDDSDIR := $(G4TMPDIR)/hdds
+ G4FIXESDIR := $(G4TMPDIR)/G4fixes

python_chooser.sh

@@ -4,12 +4,13 @@
 # correct python-related command to use
 #
 ## accepts one positional argument
-## argument can have one of four values: command, config, scons, version,
+## argument can have one of these values: command, config, scons, version, minor,
 ##   boost, or boost_cmake
 ### command: python command to use
 ### config: python-config command use
 ### scon: scons command to use
 ### version: Python major version
+### minor: Python minor version
 ### boost: name of the python-boost library, without the file extension and
 ###    without the initial "lib"
 ## writes output to stdout
@@ -44,7 +45,7 @@ then
 	    dist_name=CentOS
 	elif grep -lq Alma /etc/redhat-release
 	then
-	    dist_name=CentOS
+	    dist_name=Alma
 	else
 	    dist_name=unknown_redhat_like
 	fi
@@ -88,7 +89,7 @@ then
     then
 	pycommand[lib]=-lpython$version_major.$version_minor
     fi
-elif [[ $dist_name == RedHat || $dist_name == CentOS ]]
+elif [[ $dist_name == RedHat || $dist_name == CentOS || $dist_name == Alma ]]
 then
     if [ $dist_version -le 7 ]
     then
@@ -163,6 +164,9 @@ case $arg in
     version)
 	echo ${pycommand[version]}
 	;;	
+    minor)
+	echo $version_minor
+	;;
     *)
 	echo python_chooser.sh error: unknown argument = \"$arg\"
 	exit 1