Skip to content

Aaust os89 dev #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaust merged 3 commits into from
Feb 21, 2024
Merged

Aaust os89 dev #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
590e9ef
changes required to compile hdgeant4 on RHEL8
aaust Feb 15, 2024
536e5a2
patch no longer needed, as c++std is taken from root
aaust Feb 15, 2024
8a4f2e6
make sure, evtgen finds config files
aaust Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Makefile_diracxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
5 changes: 1 addition & 4 deletions Makefile_hdgeant4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gluex_env.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gluex_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
13 changes: 12 additions & 1 deletion python_chooser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down Expand Up @@ -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