ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround for xdg-open and incompatible shared libs

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-06-02 09:41:58 -04:00
parent 7258b2972a
commit 34a037ccfb
3 changed files with 1084 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/packaging/build_linux_tgz.sh
View File

@ -59,12 +59,14 @@ done
echo "Set up wrapper script" echo "Set up wrapper script"
MYDIR=$(dirname "$0") MYDIR=$(dirname "$0")
cp ${MYDIR}/xdg-open ${DESTDIR}/bin
cp ${MYDIR}/linux_wrapper.sh ${DESTDIR}/bin cp ${MYDIR}/linux_wrapper.sh ${DESTDIR}/bin
for s in ${DESTDIR}/bin/* for s in ${DESTDIR}/bin/*
do \ do \
EXE=$(basename $s) EXE=$(basename $s)
test ${EXE} = linux_wrapper.sh && continue test ${EXE} = linux_wrapper.sh && continue
test ${EXE} = qt.conf && continue test ${EXE} = qt.conf && continue
test ${EXE} = xdg-open && continue
ln -s bin/linux_wrapper.sh ${DESTDIR}/${EXE} ln -s bin/linux_wrapper.sh ${DESTDIR}/${EXE}
done done

14
cmake/packaging/linux_wrapper.sh
View File

@ -4,15 +4,17 @@
# reset locale to avoid problems with decimal numbers # reset locale to avoid problems with decimal numbers
export LC_ALL=C export LC_ALL=C
BASEDIR=$(dirname "$0") BASEDIR="$(dirname "$0")"
EXENAME=$(basename "$0") EXENAME="$(basename "$0")"
PATH="${BASEDIR}/bin:${PATH}"
# append to LD_LIBRARY_PATH to prefer local (newer) libs # append to LD_LIBRARY_PATH to prefer local (newer) libs
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BASEDIR}/lib LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BASEDIR}/lib"
# set some environment variables for LAMMPS etc. # set some environment variables for LAMMPS etc.
LAMMPS_POTENTIALS=${BASEDIR}/share/lammps/potentials LAMMPS_POTENTIALS="${BASEDIR}/share/lammps/potentials"
MSI2LMP_LIBRARY=${BASEDIR}/share/lammps/frc_files MSI2LMP_LIBRARY="${BASEDIR}/share/lammps/frc_files"
export LD_LIBRARY_PATH LAMMPS_POTENTIALS MSI2LMP_LIBRARY export LD_LIBRARY_PATH LAMMPS_POTENTIALS MSI2LMP_LIBRARY PATH
exec "${BASEDIR}/bin/${EXENAME}" "$@" exec "${BASEDIR}/bin/${EXENAME}" "$@"

1074
cmake/packaging/xdg-open Executable file
View File

File diff suppressed because it is too large Load Diff