From 57ae772760ab4f65822a078c8b1e49982646b2db Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sylvester.joosten@gmail.com>
Date: Thu, 20 May 2021 20:29:29 +0000
Subject: [PATCH] Fix issue where Qt5 does not load on older linux kernels
---
README.md | 6 +++---
containers/jug/Dockerfile.dev | 6 ++++++
install.py | 2 +-
install.sh | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index ab842946a..7c2d944c7 100644
--- a/README.md
+++ b/README.md
@@ -39,9 +39,9 @@ cd eic_container
modeuefile will be installed to `$PREFIX/../../etc/modulefiles`.
You can use the `-v` flag to select the version you want to install, or omit the
flag if you want to install the master build. The recommended stable
- release version is `v3.0.0`.
+ release version is `v3.0.1`.
```bash
-./install.py -v 3.0.0 <PREFIX>
+./install.py -v 3.0.1 <PREFIX>
```
Available flags:
@@ -49,7 +49,7 @@ cd eic_container
-c CONTAINER, --container CONTAINER
(opt.) Container to install. D: jug_xl (also available: jug_dev, and legacy eic container).
-v VERSION, --version VERSION
- (opt.) project version. D: 3.0.0. For MRs, use mr-XXX.
+ (opt.) project version. D: 3.0.1. For MRs, use mr-XXX.
-f, --force Force-overwrite already downloaded container
-b BIND_PATHS, --bind-path BIND_PATHS
(opt.) extra bind paths for singularity.
diff --git a/containers/jug/Dockerfile.dev b/containers/jug/Dockerfile.dev
index 1f8968c98..582ad65c1 100644
--- a/containers/jug/Dockerfile.dev
+++ b/containers/jug/Dockerfile.dev
@@ -206,6 +206,12 @@ RUN --mount=from=staging,target=/staging \
&& sed -i '/MANPATH/ s/;$/:;/' /etc/eic-env.sh \
&& cp /etc/eic-env.sh /etc/profile.d/z10_eic-env.sh
+## Bugfix to address issues loading the Qt5 libraries on Linux kernels prior to 3.15
+## See
+#https://askubuntu.com/questions/1034313/ubuntu-18-4-libqt5core-so-5-cannot-open-shared-object-file-no-such-file-or-dir
+## and links therin for more info
+RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so
+
COPY eic-shell /usr/local/bin/eic-shell
## make sure we have the entrypoints setup correctly
diff --git a/install.py b/install.py
index ddc2cff8c..1dd1763f3 100755
--- a/install.py
+++ b/install.py
@@ -20,7 +20,7 @@ import urllib.request
## Gitlab group and project/program name.
DEFAULT_IMG='jug_xl'
-DEFAULT_VERSION='3.0.0'
+DEFAULT_VERSION='3.0.1'
SHORTCUTS = ['eic-shell']
diff --git a/install.sh b/install.sh
index 96625e132..52c29e2d3 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
#!/bin/bash
CONTAINER=jug_xl
-VERSION=3.0.0
+VERSION=3.0.1
## Simple setup script that installs the container
## in your local environment under $PWD/local/lib
--
GitLab