summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrás Wacha2019-07-16 08:03:46 +0200
committerAndrás Wacha2019-07-16 08:03:46 +0200
commitb2f4757850ba9db99e2366b114c8a50227cec0e5 (patch)
treefe5283878d9be17b4ee4f0dfd24de75824c7e017
parent671c3282b53817b1f4ab87e1959fbaceadecca77 (diff)
downloadaur-b2f4757850ba9db99e2366b114c8a50227cec0e5.tar.gz
Added dependency gcc7-libs for libgfortran.so.4
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 593c4e2151b8..adfa9ac8afc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
pkgbase = atsas
pkgdesc = A program suite for small-angle scattering data analysis from biological macromolecules
pkgver = 2.8.4
- pkgrel = 2
+ pkgrel = 3
url = https://www.embl-hamburg.de/biosaxs/software.html
arch = x86_64
license = custom
+ depends = gcc7-libs
options = !strip
source = local://ATSAS-2.8.4-1_amd64.tar.gz
source = license.md
diff --git a/PKGBUILD b/PKGBUILD
index 6ac24bd0d861..6fb412c098b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: András Wacha <awacha@gmail.com>
pkgname=atsas
pkgver=2.8.4
-pkgrel=2
+pkgrel=3
pkgdesc="A program suite for small-angle scattering data analysis from biological macromolecules"
arch=('x86_64')
url="https://www.embl-hamburg.de/biosaxs/software.html"
license=('custom')
options=('!strip')
-#depends=( gcc5 )
+depends=( gcc7-libs )
# !!! You have to download the sources yourself from https://www.embl-hamburg.de/biosaxs/download.html
# !!! Use the Ubuntu-18.04 version!
@@ -24,6 +24,8 @@ package() {
cp -R "${srcdir}/ATSAS-2.8.4-1" "${pkgdir}/opt/atsas"
ATSAS_ROOT=/opt/atsas
DEST_BIN_DIR=/opt/atsas/bin
+ GCC7_LIBDIR=$(ls -d /usr/lib/gcc/${CHOST}/7.*)
+ echo "GCC7 libdir: ${GCC7_LIBDIR}"
mkdir -p "${pkgdir}/${DEST_BIN_DIR}"
mkdir -p "${pkgdir}${ATSAS_ROOT}/libexec"
for f in ${pkgdir}${ATSAS_ROOT}/bin/*; do
@@ -32,7 +34,7 @@ package() {
cat >${pkgdir}${DEST_BIN_DIR}/$f <<EOF
#!/bin/sh
export ATSAS=${ATSAS_ROOT}
-export LD_LIBRARY_PATH=${ATSAS_ROOT}/lib/${CARCH}-linux-gnu/atsas
+export LD_LIBRARY_PATH=${ATSAS_ROOT}/lib/${CARCH}-linux-gnu/atsas:${GCC7_LIBDIR}
${ATSAS_ROOT}/libexec/$f \$*
EOF
chmod +x ${pkgdir}${DEST_BIN_DIR}/$f