diff options
author | Eric Hameleers <alien@slackware.com> | 2020-08-13 19:49:37 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-08-13 19:49:37 +0000 |
commit | 81a15df9f2a2e10b62f4d37337699165ebb7e765 (patch) | |
tree | ee43cfab5939737297a18cc6db501ca07a196ead | |
parent | b3ee1d92bc3624ce38b29cb934c4760491dd5d52 (diff) | |
download | asb-81a15df9f2a2e10b62f4d37337699165ebb7e765.tar.gz asb-81a15df9f2a2e10b62f4d37337699165ebb7e765.tar.xz |
libreoffice: on Slackware < 15.0 also copy libgcc_s.so.* into the program directory, otherwise 32bit binaries fail
-rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index f16b301a..5b1b725b 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -1839,12 +1839,14 @@ for file in $(ls $SRCDIR/profile.d/${PRGNAM}*) ; do done chmod 755 $PKG/etc/profile.d/* -# On Slackware older than 14.2+, also copy the libstdc++.so into the package, -# because the LibreOffice binaries will depend on it and a default Slackware -# will not contain this newer version (we use a newer version of gcc -# to compile libreoffice): +# On Slackware older than 14.2+, also copy the libgcc_s.so and libstdc++.so +# libraries into the package, because the LibreOffice binaries will +# depend on it and a default Slackware will not contain this newer version +# (we used a newer version of gcc to compile libreoffice): if [ -n "$(grep ^[^+]*$ /etc/slackware-version)" ]; then if [ $(cat /etc/slackware-version |cut -d' ' -f2 |cut -d. -f1) -le 14 ]; then + cp -ia /usr/lib${LIBDIRSUFFIX}/libgcc_s.so.* \ + $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/program/ GLIBCXXLIB=$(readlink -f /usr/lib${LIBDIRSUFFIX}/libstdc++.so.6) cp -ia $GLIBCXXLIB $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/program/ ln -s $(basename $GLIBCXXLIB) \ |