diff options
Diffstat (limited to 'system/wine-staging')
| -rw-r--r-- | system/wine-staging/README | 81 | ||||
| -rw-r--r-- | system/wine-staging/README.MULTILIB | 31 | ||||
| -rw-r--r-- | system/wine-staging/README.SLACKWARE | 21 | ||||
| -rw-r--r-- | system/wine-staging/flex.patch (renamed from system/wine-staging/0001-winhlp32-Workaround-a-bug-in-Flex.patch) | 6 | ||||
| -rw-r--r-- | system/wine-staging/wine-staging.SlackBuild | 141 | ||||
| -rw-r--r-- | system/wine-staging/wine-staging.info | 16 | ||||
| -rw-r--r-- | system/wine-staging/x86_remove_fpic.patch | 202 |
7 files changed, 151 insertions, 347 deletions
diff --git a/system/wine-staging/README b/system/wine-staging/README index 070ac7f7d9..e9b882a9b8 100644 --- a/system/wine-staging/README +++ b/system/wine-staging/README @@ -1,68 +1,39 @@ -wine-staging (Wine Staging is the testing area of winehq.org) +Wine is an Open Source implementation of the Windows API on top of X +for Linux and Unix. -It contains bug fixes and features, which have not been integrated -into the development branch yet. The idea of Wine Staging is to -provide experimental features faster to end users and to give -developers the possibility to discuss and improve their patches -before they are integrated into the main branch. +wine-staging is the current development branch of wine appended with +full patches of the staging branch. -This is a current development branch of Wine appended with full -patches of the Staging branch. +It contains bug fixes and features, which have not been integrated into +the development branch yet. The idea of wine-staging is to provide +experimental features faster to end users and to give developers the +possibility to discuss and improve their patches before they are +integrated into the main branch. -MULTILIB. +NOTE: This builds the cutting-edge version of wine. If you need +something more stable then you may want to check out wine. -With no options this script will build the 32bit wine-staging -package ONLY!, for which you need to have a FULL multilib -system installed (see below). +======================================================================= -To build a package for both 64bit and 32bit Windows executable -support, use this: +OPTIONAL DEPENDENCIES - # WIN64=yes sh wine-staging.SlackBuild +fontforge: To build tahoma, tahomabd, and marlett fonts. +webcore-fonts: For MS fonts for the web and Windows Vista. -See README.SLACKWARE for a giant list of dependencies and -AlienBOB's multilib readme and repo: +======================================================================= -https://docs.slackware.com/slackware:multilib -http://www.slackware.com/~alien/multilib/ +OPTIONS -From wine's maintainer David Woodfall you can grab a script -to get and install the multilib packages: +If your video card does not support hardware accelerated OpenGL, +you may disable OpenGL support by using: -http://dawoodfall.net/files/scripts/slackware/alien-multilib-rysnc.sh + OPENGL=no ./wine.SlackBuild -Be sure to read the short instructions at the top. If you use -slackpkg then you will also want to blacklist his packages in -/etc/slackpkg/blacklist: +======================================================================= - [0-9]+alien - [0-9]+compat32 +NOTES -WINEPREFIX. - -With 64bit support you would use the wine64 binary. If you have a -combined 32 and 64bit package you need to set the environmental -variable WINEPREFIX to point to the 64bit wine directory when running -wine64, which should be different to the 32bit directory (~/.wine by -default). Example: - - $ WINEPREFIX=~/.wine64 wine64 notepad - -To build the 32bit wine on x86_64 you will need to have multilib -packages installed, unless you want to build for Windows 64 bit -applications only using: - - # WIN64=yes NOWIN32=yes sh wine-staging.SlackBuild - -OPENGL. - -To disable OpenGL support, use: - - # OPENGL=no ./wine.SlackBuild - -Optional dependencies: fontforge, webcore-fonts, winetricks - -NOTE: you can increase buildtime passing some like that to the -SlackBuild script: - - # MAKEFLAGS=-j6 ./wine-staging.SlackBuild +64bit systems now default to the new WOW64 mode which builds both 64bit +and 32bit PE dlls. This has removed the multilib dependency that was +pereviously required and will allow execution of both 64bit and 32bit +binaries. No multilib required. diff --git a/system/wine-staging/README.MULTILIB b/system/wine-staging/README.MULTILIB new file mode 100644 index 0000000000..d14bd8b2ad --- /dev/null +++ b/system/wine-staging/README.MULTILIB @@ -0,0 +1,31 @@ +The legacy method to build 32 bit wine on x86_64 will will require +a multilib installation. + +Please read up alienBOB's multilib readme and repo: + +https://docs.slackware.com/slackware:multilib +http://www.slackware.com/~alien/multilib/ + +A script that rsyncs with alienBOB's repo and installs the multilib +packages which can be found here: + +https://slackware.uk/~dive/scripts/alien-multilib-rsync.sh + +Be sure to read the short instructions at the top. If you use slackpkg +then you will also want to blacklist his packages in +/etc/slackpkg/blacklist: + +[0-9]+alien +[0-9]+compat32 + +If you have a combined 32 and 64 bit package you need to set the +environmental variable WINEPREFIX to point to the 64 bit wine directory +when running wine64, which should be different to the 32 bit directory +(~/.wine by default). + +Example: + +WINEPREFIX=~/.wine64 wine64 notepad + +To build wine using the legacy method, pass MULTILIB=yes to the build +script. diff --git a/system/wine-staging/README.SLACKWARE b/system/wine-staging/README.SLACKWARE index 5b02735897..1885540021 100644 --- a/system/wine-staging/README.SLACKWARE +++ b/system/wine-staging/README.SLACKWARE @@ -15,11 +15,11 @@ List: | |------ + glib2-compat32 | | |------ + libffi-compat32 | |------ + pixman-compat32 - | |------ + gtk+3-compat32 (Self conversion) + | |------ + gtk+3-compat32 | | |------ + atk-compat32 - | | |------ + at-spi2-atk (current only) + | | |------ + at-spi2-atk | | |------ + gdk-pixbuf2-compat32 - | | |------ + libepoxy-compat32 (current only) + | | |------ + libepoxy-compat32 | | |------ + libICE-compat32 | | |------ + libSM-compat32 | | | |------ + at-spi2-atk-compat32 @@ -29,7 +29,6 @@ List: | | |------ + pango-compat32 | | | |------ + harfbuzz-compat32 | | | |------ + libXft-compat32 - | | |------ + udev-compat32 | |------ ? This is only needed if you care about GTK3 theme support. |----- x dbus-compat32 |----- + fontconfig-compat32 @@ -40,7 +39,7 @@ List: | | to spit out error messages of it missing. |----- + gnutls-compat32 | |------ + gmp-compat32 - | |------ + libidn-compat32 (current only) + | |------ + libidn-compat32 | |------ + nettle-compat32 | |------ + p11-kit-compat32 | |------ + zlib-compat32 @@ -53,6 +52,8 @@ List: | |------ ? Needed by some programs but compiles without it. |----- + libjpeg-turbo-compat32 |----- + libpng-compat32 + |----- x libva-compat32 + | |------ ? VAAPI backend for DXVA2 GPU decoding. |----- + libXcomposite-compat32 |----- + libXcursor-compat32 | |------ + libXfixes-compat32 @@ -68,14 +69,12 @@ List: |----- + libXxf86dga-compat32 |----- + libXxf86vm-compat32 |----- x libxml2-compat32 - | |------ + aaa_elflibs-compat32 + | |------ + aaa_libraries-compat32 | |------ ? This is needed for .NET to work correctly. - |----- x libva-compat32 - | |------ ? VAAPI backend for DXVA2 GPU decoding. |----- + mesa-compat32 |----- + mpg123-compat32 | |------ + libtool-compat32 - |----- + OpenAL-compat32 - |----- x oss + |----- + openal-soft-compat32 + |----- x oss (self conversion) |----- + openjpeg-compat32 - |----- x PulseAudio + |----- x pulseaudio diff --git a/system/wine-staging/0001-winhlp32-Workaround-a-bug-in-Flex.patch b/system/wine-staging/flex.patch index d674ead817..52fc3ff53a 100644 --- a/system/wine-staging/0001-winhlp32-Workaround-a-bug-in-Flex.patch +++ b/system/wine-staging/flex.patch @@ -19,8 +19,8 @@ index 8f6945ca988..da2dd22e447 100644 +%option noinput nounput never-interactive 8bit noyywrap %x quote %{ - #include "config.h" -@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) + #include <assert.h> +@@ -366,7 +366,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) { return lex_data ? lex_data->window : Globals.active_win; } @@ -29,5 +29,3 @@ index 8f6945ca988..da2dd22e447 100644 -int yywrap(void) { return 1; } -#endif -- -2.11.0 - diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild index b92c4a6ec4..138bf6251d 100644 --- a/system/wine-staging/wine-staging.SlackBuild +++ b/system/wine-staging/wine-staging.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # # Slackware build script for wine-staging. # -# Copyright 2016-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2023-2024 Steven Voges <Oregon, USA> +# Copyright 2016-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com> # # All rights reserved. @@ -29,10 +30,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=wine-staging -VERSION=${VERSION:-4.21} +VERSION=${VERSION:-9.7} +WINEVERSION=$VERSION +STAGINGVERSION=$VERSION +ARCHS="i386,x86_64" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -42,64 +53,71 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi -# If your video card does not support hardware accelerated OpenGL, -# run the script like: OPENGL=NO ./wine.SlackBuild -if [ "${OPENGL:-YES}" = "YES" ]; then +OPENGL=${OPENGL@L} +if [ "${OPENGL:-yes}" = "yes" ]; then do_opengl="with" else do_opengl="without" fi -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$(uname -m) ;; - esac -fi - -if [ -n "$NOWIN32" ] && [ -z "$WIN64" ]; then - echo "Both 64 and 32 bit builds disabled. Nothing to do." - exit 1 -fi - -# These should work for anything not specified below -BUILD_ARCH=$ARCH"-slackware-linux" +BUILD_ARCH="$ARCH-slackware-linux" SLKCFLAGS="-O2" case "$ARCH" in - arm) - BUILD_ARCH=$ARCH"-slackware-linux-gnueabi" - ;; - i?86) - # -Os was -O2, fix for: - # https://bugs.winehq.org/show_bug.cgi?id=42406 - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911 - # https://bugs.gentoo.org/613128 - SLKCFLAGS="-Os -march=$ARCH -mtune=i686" - ;; - x86_64) - [ -n "$WIN64" ] && WIN64="--enable-win64" - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - ;; + arm) + BUILD_ARCH="$ARCH-slackware-linux-gnueabi" + SLKCFLAGS="-O2" + ;; + i?86) + # -Os was -O2, fix for: + # https://bugs.winehq.org/show_bug.cgi?id=42406 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911 + # https://bugs.gentoo.org/613128 + SLKCFLAGS="-Os -march=$ARCH -mtune=i686" + WINE32="yes" + ;; + x86_64) + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + WINE64="yes" + ;; esac +MULTILIB=${MULTILIB@L} +if [[ "$ARCH" != "x86_64" && "$MULTILIB" = "yes" ]]; then + echo "Cannot build for multilib on non-64bit systems." + exit 1 +elif [[ "$ARCH" = "x86_64" && "$MULTILIB" = "yes" ]]; then + WINETMP="$( mktemp -d $TMP/wine-test-XXXXXX )" + echo "int main(void) {; return(0); }" > "$WINETMP/test.c" + gcc -m32 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE32TEST=${WINE32TEST:-yes} + rm -rf "$WINETMP" + if [[ $WINE32TEST = "yes" ]]; then + ARCHS="x86_64" + WINE32="yes" + else + echo "MULTILIB was requested, however the multilib test has failed." + echo "Have the compat32 libraries been installed?" + echo "Please see README.MULTILIB" + exit 1 + fi +fi + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION wine-$VERSION -tar xvf $CWD/wine-$VERSION.tar.xz -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +rm -rf $PRGNAM-$STAGINGVERSION wine-$WINEVERSION +tar xvf $CWD/wine-$WINEVERSION.tar.xz +tar xvf $CWD/$PRGNAM-$STAGINGVERSION.tar.gz -cd $PRGNAM-$VERSION/patches +cd $PRGNAM-$STAGINGVERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -107,9 +125,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -./patchinstall.sh DESTDIR=$TMP/wine-$VERSION --all - -cd $TMP/wine-$VERSION +cd $TMP/wine-$WINEVERSION +python3 $TMP/$PRGNAM-$STAGINGVERSION/staging/patchinstall.py --all chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -118,17 +135,11 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Fix for flex. -patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch - -# fix path of opencl headers. +patch -p1 < $CWD/flex.patch +# Fix path of opencl headers. sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* -# Remove -fPIC for i?86 or the build will hang. -if [ "$ARCH" == "i?86" ]; then - patch -p1 --verbose < $CWD/x86_remove_fpic.patch -fi - -if [ -n "$WIN64" ]; then +if [ "$WINE64" = "yes" ]; then wine64="--with-wine64=../wine64" mkdir wine64 cd wine64 @@ -137,12 +148,13 @@ if [ -n "$WIN64" ]; then CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ../configure \ - --enable-win64 \ --prefix=/usr \ --libdir=/usr/lib64 \ --localstatedir=/var \ --sysconfdir=/etc \ --mandir=/usr/man \ + --enable-win64 \ + --enable-archs=$ARCHS \ --with-x \ --with-gnutls \ --${do_opengl}-opengl \ @@ -150,17 +162,15 @@ if [ -n "$WIN64" ]; then --program-suffix= \ --disable-tests \ --build=$BUILD_ARCH - make depend make make install DESTDIR=$PKG cd .. fi -if [ -z "$NOWIN32" ]; then +if [ "$WINE32" = "yes" ]; then mkdir wine32 cd wine32 - export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PKG_CONFIG_PATH" LDFLAGS="-L/usr/lib -ldl" \ @@ -180,7 +190,6 @@ if [ -z "$NOWIN32" ]; then --program-suffix= \ --disable-tests \ --build=$BUILD_ARCH - make depend make make install DESTDIR=$PKG @@ -197,7 +206,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r install -d $PKG/etc/fonts/conf.{avail,d} install -m644 $CWD/30-win32-aliases.conf $PKG/etc/fonts/conf.avail ln -sf /etc/fonts/conf.avail/30-win32-aliases.conf $PKG/etc/fonts/conf.d/30-win32-aliases.conf -install -Dm 644 $CWD/wine-binfmt.conf $PKG/usr/lib/binfmt.d/wine.conf +install -Dm 644 $CWD/wine-binfmt.conf $PKG/usr/lib$LIBDIRSUFFIX/binfmt.d/wine.conf # Create Wine menu structure: mkdir -p $PKG/etc/xdg/menus/applications-merged @@ -216,11 +225,9 @@ convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/wine-uninstaller.png cp programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/ cp $CWD/*.desktop $PKG/usr/share/applications/ -DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION" -FONTS_LICENSE="COPYING.arial COPYING.cour COPYING.msyh COPYING.times" - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp $DOCS $FONTS_LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ANNOUNCE.md AUTHORS COPYING.* LICENSE* MAINTAINERS README.md VERSION \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -228,4 +235,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info index 46c3cd7d08..019dab3def 100644 --- a/system/wine-staging/wine-staging.info +++ b/system/wine-staging/wine-staging.info @@ -1,12 +1,12 @@ PRGNAM="wine-staging" -VERSION="4.21" +VERSION="9.7" HOMEPAGE="https://wiki.winehq.org/Wine-Staging" -DOWNLOAD="https://dl.winehq.org/wine/source/4.x/wine-4.21.tar.xz \ - https://github.com/wine-staging/wine-staging/archive/v4.21/wine-staging-4.21.tar.gz" -MD5SUM="8c0b7b7f16c9fcbad663a35903b4613b \ - c253c253bdfb5ece6b7889bb642894a7" -DOWNLOAD_x86_64="UNSUPPORTED" +DOWNLOAD="https://dl.winehq.org/wine/source/9.x/wine-9.7.tar.xz \ + https://github.com/wine-staging/wine-staging/archive/v9.7/wine-staging-9.7.tar.gz" +MD5SUM="a419a59b3a00a0aa49646065c1aa78a0 \ + 26234ce1a1f9eacce2ea9b19ca70137b" +DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="Steven Voges" +EMAIL="svoges.sbo@gmail.com" diff --git a/system/wine-staging/x86_remove_fpic.patch b/system/wine-staging/x86_remove_fpic.patch deleted file mode 100644 index ac949dc86d..0000000000 --- a/system/wine-staging/x86_remove_fpic.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff -Naur a/configure b/configure ---- a/configure 2018-01-02 20:58:13.000000000 +0000 -+++ b/configure 2018-01-08 18:31:55.480995247 +0000 -@@ -8072,7 +8072,7 @@ - done - - LIBEXT="dylib" -- DLLFLAGS="$DLLFLAGS -fPIC" -+ DLLFLAGS="$DLLFLAGS " - LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" - COREFOUNDATION_LIBS="-framework CoreFoundation" -@@ -8304,14 +8304,14 @@ - ;; - - linux-android*) -- DLLFLAGS="$DLLFLAGS -fPIC" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } -+ DLLFLAGS="$DLLFLAGS " -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--export-dynamic" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--export-dynamic... " >&6; } - if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" -+CFLAGS="$CFLAGS -Wl,--export-dynamic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8330,14 +8330,14 @@ - if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : - LDEXECFLAGS="-Wl,--export-dynamic" - fi -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,--rpath,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8358,14 +8358,14 @@ - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" - else -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,-R,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8448,7 +8448,7 @@ - ;; - - *) -- DLLFLAGS="$DLLFLAGS -fPIC" -+ DLLFLAGS="$DLLFLAGS " - LDEXECFLAGS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5 - $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; } -@@ -8456,7 +8456,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic" -+CFLAGS="$CFLAGS -shared -Wl,-Bsymbolic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - void myfunc() {} -@@ -8475,13 +8475,13 @@ - if test "$ac_cv_c_dll_gnuelf" = "yes" - then - LIBWINE_LDFLAGS="-shared" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-soname,confest.so.1" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,-soname,confest.so.1... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1" -+CFLAGS="$CFLAGS -shared -Wl,-soname,confest.so.1" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8500,13 +8500,13 @@ - if test "x$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" = xyes; then : - LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-h,confest.so.1" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,-h,confest.so.1... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1" -+CFLAGS="$CFLAGS -shared -Wl,-h,confest.so.1" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8528,13 +8528,13 @@ - fi - - echo '{ global: *; };' >conftest.map -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,--version-script=conftest.map" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,--version-script=conftest.map... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map" -+CFLAGS="$CFLAGS -shared -Wl,--version-script=conftest.map" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8555,13 +8555,13 @@ - fi - rm -f conftest.map - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--export-dynamic" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--export-dynamic... " >&6; } - if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" -+CFLAGS="$CFLAGS -Wl,--export-dynamic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8581,14 +8581,14 @@ - LDEXECFLAGS="-Wl,--export-dynamic" - fi - -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,--rpath,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8609,14 +8609,14 @@ - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" - else -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,-R,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8804,7 +8804,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic" -+CFLAGS="$CFLAGS -Wl,-G,-h,conftest.so.1.0,-B,symbolic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - void myfunc() {} |