From 2172a8cc3f600553c7c5656a7736a85ae5f211b7 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Sat, 26 Jan 2019 00:56:59 +0100
Subject: [PATCH] Fixed qp_export

---
 bin/qp_export_as_tgz | 4 +++-
 etc/paths.rc         | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/qp_export_as_tgz b/bin/qp_export_as_tgz
index 84dac639..64f03713 100755
--- a/bin/qp_export_as_tgz
+++ b/bin/qp_export_as_tgz
@@ -154,7 +154,7 @@ for i in ${FORTRAN_EXEC} ; do
 done > ${QPACKAGE_STATIC}/data/executables
 
 mkdir --parents -- ${QPACKAGE_STATIC}/src/bitmask
-cp ${QP_ROOT}/src/Bitmask/bitmasks_module.f90 ${QPACKAGE_STATIC}/src/bitmask
+cp ${QP_ROOT}/src/bitmask/bitmasks_module.f90 ${QPACKAGE_STATIC}/src/bitmask
 
 
 echo "Copying dynamic libraries"
@@ -174,6 +174,8 @@ for i in ${ALL_LIBS} ${MKL_LIBS} ; do
   cp -- ${i} ${QPACKAGE_STATIC}/extra_lib
 done
 
+rm -rf extra_lib/{libc.so*,libpthread.so*,librt.so*,libm.so*,libdl.so*,libgcc_s.so*}
+
 if [[ $? -ne 0 ]] ; then
   echo 'cp -- ${ALL_LIBS} ${MKL_LIBS} ${QPACKAGE_STATIC}/extra_lib'
   exit 1
diff --git a/etc/paths.rc b/etc/paths.rc
index 758097d9..7f7e1a97 100644
--- a/etc/paths.rc
+++ b/etc/paths.rc
@@ -32,7 +32,8 @@ export PYTHONPATH=$(qp_prepend_export "PYTHONPATH" "${QP_EZFIO}/Python":"${QP_PY
 
 export PATH=$(qp_prepend_export "PATH" "${QP_PYTHON}":"${QP_ROOT}"/bin:"${QP_ROOT}"/ocaml)
 
-export LD_LIBRARY_PATH=$(qp_prepend_export "LD_LIBRARY_PATH" "${QP_ROOT}"/lib:"${QP_ROOT}"/lib64)
+export LD_LIBRARY_PATH=$(qp_prepend_export "LD_LIBRARY_PATH" "${QP_ROOT}"/lib)":${QP_ROOT}"/extra_lib
+
 
 export LIBRARY_PATH=$(qp_prepend_export "LIBRARY_PATH" "${QP_ROOT}"/lib:"${QP_ROOT}"/lib64)