From 74a6c2915d4472d5e70a4ebe916ac25b8e0a09e7 Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Mon, 30 Sep 2024 13:38:58 +0200 Subject: [PATCH] spns #43023: add compil script section and patch to remove qt ABI tag for singularity container --- products/compil_scripts/qt-5.15.2.sh | 7 +++++++ products/patches/qt_5_15_2_remove_ABI_tag.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 products/patches/qt_5_15_2_remove_ABI_tag.patch diff --git a/products/compil_scripts/qt-5.15.2.sh b/products/compil_scripts/qt-5.15.2.sh index 9544462..f0db65c 100755 --- a/products/compil_scripts/qt-5.15.2.sh +++ b/products/compil_scripts/qt-5.15.2.sh @@ -13,6 +13,13 @@ case $LINUX_DISTRIBUTION in ;; esac +if [ -n "$SINGULARITY_NAME" ]; then + echo "WARNING: singularity env detected. applying ABI-tag patch" + PATCH_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/../patches + cd $SOURCE_DIR + patch -Nbp1 -i $PATCH_DIR/qt_5_15_2_remove_ABI_tag.patch +fi + if [ -n "$SAT_DEBUG" ] then BUILD_TYPE="-debug" diff --git a/products/patches/qt_5_15_2_remove_ABI_tag.patch b/products/patches/qt_5_15_2_remove_ABI_tag.patch new file mode 100644 index 0000000..8fd356c --- /dev/null +++ b/products/patches/qt_5_15_2_remove_ABI_tag.patch @@ -0,0 +1,12 @@ +--- qt/qtbase/qmake/generators/unix/unixmake2.cpp 2020-10-27 09:02:11.000000000 +0100 ++++ qt_dev/qtbase/qmake/generators/unix/unixmake2.cpp 2024-09-25 12:25:10.704520631 +0200 +@@ -603,7 +603,8 @@ + t << "\n\t" + << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET0)") << "\n\t" + << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET1)") << "\n\t" +- << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET2)"); ++ << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET2)") << "\n\t" ++ << "-$(STRIP) --remove-section=.note.ABI-tag $(TARGET1)"; + } + if (!destdir.isEmpty()) { + t << "\n\t" -- 2.39.2