diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-09 14:26:53 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-12 00:29:37 +0700 |
| commit | dcf5419ca1ab00fb23ffadf21332fe7e8c5938e5 (patch) | |
| tree | 59bc36fcb40bd23572884c4d2dee1c1035e141cd | |
| parent | d773e772f3b75301a031db829e3aefe5847dc3e6 (diff) | |
system/xchm: Don't depend on wx-config symlink.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/xchm/xchm.SlackBuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild index fa12c697654b7..3ac57e98a1033 100644 --- a/system/xchm/xchm.SlackBuild +++ b/system/xchm/xchm.SlackBuild @@ -3,6 +3,9 @@ # Slackware build script for xchm # Written by Michael Gehring <mg@ebfe.org> +# 20220209 bkw: Modified by SlackBuilds.org, fix the build when wxGTK3 +# was installed after wxPython. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xchm @@ -13,15 +16,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -31,8 +31,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing" @@ -63,6 +63,7 @@ find -L . \ CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ ./configure \ + --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --build=$ARCH-slackware-linux \ |