summaryrefslogtreecommitdiffstats
path: root/wine
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-03-19 12:08:05 +0000
committer Eric Hameleers <alien@slackware.com>2014-03-19 12:08:05 +0000
commitf6c404eae064985af9da07a3fd50454452504a36 (patch)
tree435ac40826e96a31b6451101f87cb12d1bcafa9a /wine
parentcd27097199cd48363614839c6ff82faf164e4417 (diff)
downloadasb-f6c404eae064985af9da07a3fd50454452504a36.tar.gz
asb-f6c404eae064985af9da07a3fd50454452504a36.tar.xz
Allow for possibility to skip wine64
Diffstat (limited to 'wine')
-rwxr-xr-xwine/build/wine.SlackBuild22
1 files changed, 15 insertions, 7 deletions
diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index 841e42ae..fa31f166 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -109,6 +109,10 @@ VERSION=$(echo $SRCVER | tr '-' '.')
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
+# If you do not want wine64 on Slackware64, set this to "no":
+DO_WINE64=$DO_WINE64:-"yes"}
+
+# Add the "Gecko", Wine's own implementation of Internet Explorer.
# For matching wine_gecko & wine versions, see http://wiki.winehq.org/Gecko
GECKO=${GECKO:-2.24}
@@ -290,7 +294,7 @@ function wineconfigure ()
$*
}
-if [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
# First, wine64:
mkdir wine64
cd wine64
@@ -308,16 +312,20 @@ if [ "$ARCH" = "x86_64" ]; then
make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
cd -
else
- wineconfigure 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
- make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
- make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
- make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+ # No 64-bit wine requested, or we are on 32-bit Slackware:
+ mkdir wine32
+ cd wine32
+ wineconfigure 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+ make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+ make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+ make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+ cd -
fi
-# Add the wine-gecko MSI installer to the Wine package:
+# Add the wine-gecko MSI installer(s) to the Wine package:
mkdir -p $PKG/usr/share/wine/gecko
install -m0644 ${SOURCE[1]} $PKG/usr/share/wine/gecko/
-if [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
install -m0644 ${SOURCE[2]} $PKG/usr/share/wine/gecko/
fi