diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-03-05 16:18:49 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-03-05 16:18:49 +0000 |
| commit | 7ddfc7e13f160a14a8a4e10e937da2048cab48a7 (patch) | |
| tree | 0c2423f8d4219334434a2128db28b5259fc96e2e /libreoffice/build/libreoffice.SlackBuild | |
| parent | 5bd2841fbf6f32c863c7b1d3c024574568505055 (diff) | |
| download | asb-7ddfc7e13f160a14a8a4e10e937da2048cab48a7.tar.gz asb-7ddfc7e13f160a14a8a4e10e937da2048cab48a7.tar.xz | |
libreoffice: use ARCH after it has been defined... not before
Diffstat (limited to 'libreoffice/build/libreoffice.SlackBuild')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index f6153802..6b1e478a 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -326,19 +326,6 @@ else COMPR="xz" fi -# Causes a lot of trouble otherwise: -if ! which gpgme-config 1>/dev/null 2>/dev/null ; then - GPGMEOPTS="--without-system-gpgmepp" -elif [ $(gpgme-config --version |cut -d. -f1) -eq 1 -a $(gpgme-config --version |cut -d. -f2) -lt 9 ]; then - # gpgme < 1.9.0 so don't use the system libs: - GPGMEOPTS="--without-system-gpgmepp" -elif [ "$ARCH" = "x86_64" ]; then - echo "Using system gpgme" - GPGMEOPTS="--with-system-gpgmepp" -else - GPGMEOPTS="--without-system-gpgmepp" -fi - DOCS="AUTHORS COPYING* MAINTAINERS NEWS README* TODO" PACKAGER="Eric Hameleers" @@ -1172,6 +1159,19 @@ else GSTOPTS="--enable-gstreamer-0-10 --disable-gstreamer-1-0" fi +# Causes a lot of trouble otherwise: +if ! which gpgme-config 1>/dev/null 2>/dev/null ; then + GPGMEOPTS="--without-system-gpgmepp" +elif [ $(gpgme-config --version |cut -d. -f1) -eq 1 -a $(gpgme-config --version |cut -d. -f2) -lt 9 ]; then + # gpgme < 1.9.0 so don't use the system libs: + GPGMEOPTS="--without-system-gpgmepp" +elif [ "$ARCH" = "x86_64" ]; then + echo "Using system gpgme" + GPGMEOPTS="--with-system-gpgmepp" +else + GPGMEOPTS="--without-system-gpgmepp" +fi + # Make it install into proper directories: export OOInBase="/usr/lib${LIBDIRSUFFIX}/libreoffice" export OOInstall="/usr/lib${LIBDIRSUFFIX}/libreoffice" |