Merge pull request #263 from JeffersonLab/aaust_OS89_dev

Aaust os89 dev
JeffersonLab · Feb 21, 2024 · e32d70a · e32d70a
2 parents 903c0bb + 8a4f2e6
commit e32d70a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/Makefile_diracxx b/Makefile_diracxx
@@ -69,17 +69,12 @@ $(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: $(DIRACXX_HOME)/.patch_done
+$(DIRACXX_HOME)/.cmake_done: $(SOURCE_CODE_TARGET)
 	cd $(DIRACXX_HOME); \
 	mkdir -p build; \
 	cd build; \

diff --git a/Makefile_hdgeant4 b/Makefile_hdgeant4
@@ -86,10 +86,7 @@ $(HDGEANT4_HOME)/.make_done: $(HDGEANT4_HOME)/.patch_done
 	    then echo Geant4 setup not complete, sourcing geant4make.sh ; \
 	    . `find $(G4ROOT)/share/ -name geant4make.sh` ; \
 	fi ; \
-	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 ; \
+	make PYTHON_CONFIG=$(PYTHON_CONFIG) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) BOOST_PYTHON_LIB=-l$(PYTHON_BOOST) $(QTHOME_DEF) $(HDGEANT4_MAKE_OPTIONS) ; \
 	date > $@
 
 $(HDGEANT4_HOME)/hdgeant4_prereqs_version.xml: $(HDGEANT4_HOME)/.make_done

diff --git a/gluex_env.csh b/gluex_env.csh
@@ -177,6 +177,8 @@ endif
 if ($?EVTGENDIR) then
     echo $LD_LIBRARY_PATH | grep $EVTGENDIR/lib > /dev/null
     if ($status) setenv LD_LIBRARY_PATH $EVTGENDIR/lib:$LD_LIBRARY_PATH
+    setenv EVTGEN_DECAY_FILE $EVTGENDIR/share/DECAY.DEC
+    setenv EVTGEN_PARTICLE_DEFINITIONS $EVTGENDIR/share/evt.pdl
 endif
 #
 if (! $?JANA_PLUGIN_PATH) then

diff --git a/gluex_env.sh b/gluex_env.sh
@@ -258,6 +258,8 @@ then
     if [ `echo $LD_LIBRARY_PATH | grep -c $EVTGENDIR/lib` -eq 0 ]
     then
 	export LD_LIBRARY_PATH=$EVTGENDIR/lib:$LD_LIBRARY_PATH
+	export EVTGEN_DECAY_FILE=$EVTGENDIR/share/DECAY.DEC
+	export EVTGEN_PARTICLE_DEFINITIONS=$EVTGENDIR/share/evt.pdl
     fi
 fi
 #

diff --git a/python_chooser.sh b/python_chooser.sh
@@ -98,12 +98,22 @@ then
 	pycommand[config]=python-config
 	pycommand[scons]=scons
 	pycommand[boost]=boost_python
-    else
+	pycommand[lib]=-lpython$version_major.$version_minor
+    elif [ $dist_version -eq 8 ]
+    then
 	pycommand[command]=python3
 	get_python_version
 	pycommand[config]=python$version_major-config
 	pycommand[scons]=scons-$version_major
 	pycommand[boost]=boost_python$version_major
+	pycommand[lib]=-lpython$version_major
+    else
+	pycommand[command]=python3
+	get_python_version
+	pycommand[config]=python$version_major-config
+	pycommand[scons]=scons-$version_major
+	pycommand[boost]=boost_python$version_major$version_minor
+	pycommand[lib]=-lpython$version_major.$version_minor
     fi
     pycommand[version]=$version_major
 elif [ $dist_name == Ubuntu ]
@@ -169,6 +179,7 @@ case $arg in
 	;;
     *)
 	echo python_chooser.sh error: unknown argument = \"$arg\"
+	echo accepted arguments: boost, boost_cmake, command, config, info, lib, scons, version, minor
 	exit 1
 	;;
 esac