From f7879720ac2584a2de03eca13b9b8a8422d3f2e0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 May 2020 20:06:03 +0200 Subject: [PATCH] wine: enable build for x86_64-musl --- srcpkgs/wine/files/wine | 14 +++++++++----- srcpkgs/wine/template | 8 ++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/srcpkgs/wine/files/wine b/srcpkgs/wine/files/wine index bdcbbc00e98..0002320ccf8 100644 --- a/srcpkgs/wine/files/wine +++ b/srcpkgs/wine/files/wine @@ -6,12 +6,16 @@ wine32=/usr/libexec/wine/wine wine64=/usr/libexec/wine/wine64 wine32_hint () { - echo "it looks like wine-32bit is missing, you should install it." - if uname -a | grep "x86_64" > /dev/null && xbps-query -l | grep void-repo-multilib > /dev/null; then - echo "the multilib repository needs to be enabled first. as root, please" - echo "execute \"xbps-install -S void-repo-multilib && xbps-install -S wine-32bit\"" + if [ "$(xbps-uhelper arch)" = "x86_64-musl" ]; then + echo "wine support under musl is limited to 64bit" else - echo "as root, please execute \"xbps-install -S wine-32bit\"" + echo "it looks like wine-32bit is missing, you should install it." + if uname -a | grep "x86_64" > /dev/null && xbps-query -l | grep void-repo-multilib > /dev/null; then + echo "the multilib repository needs to be enabled first. as root, please" + echo "execute \"xbps-install -S void-repo-multilib && xbps-install -S wine-32bit\"" + else + echo "as root, please execute \"xbps-install -S wine-32bit\"" + fi fi } diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 7da0941a90c..ef8f3aaf14b 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -12,9 +12,9 @@ distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.ta checksum=cbad04c261437abec16945cd7ca83c77950f3e03099d7e3f883a6ea7293233cf lib32mode=full -archs="i686 x86_64" +archs="i686 x86_64*" -hostmakedepends="pkg-config flex prelink gettext" +hostmakedepends="pkg-config flex gettext" makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel @@ -40,6 +40,10 @@ case $XBPS_TARGET_MACHINE in ;; esac +if [ "$XBPS_LIBC" = "glibc" ]; then + hostmakedepends+=" prelink" +fi + _wine_libexec="/usr/libexec/wine" nopie_files="${_wine_libexec}/wine${_wine_suffix}"