diff options
Diffstat (limited to 'system/wine/wine.SlackBuild')
| -rw-r--r-- | system/wine/wine.SlackBuild | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild index a15b8b7947..b95d09d669 100644 --- a/system/wine/wine.SlackBuild +++ b/system/wine/wine.SlackBuild @@ -24,12 +24,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine -VERSION=${VERSION:-1.8.3} +VERSION=${VERSION:-2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -49,8 +49,8 @@ IEFIX=${IEFIX:-NO} # the run the script like: OPENGL=NO ./wine.SlackBuild OPENGL=${OPENGL:-YES} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -90,9 +90,9 @@ if [ "$OPENGL" = "YES" ]; then do_opengl="without" fi -# All of the libraries produced are 32bit libs anyway -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# Fix for flex +patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch + ./configure \ --prefix=/usr \ --mandir=/usr/man \ @@ -101,7 +101,6 @@ CXXFLAGS="$SLKCFLAGS" \ --${do_opengl}-opengl \ --build=$ARCH-slackware-linux -make depend make make install DESTDIR=$PKG |