[PR PATCH] wine: enable build for x86_64-musl

[PR PATCH] wine: enable build for x86_64-musl

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages wine-musl
https://github.com/void-linux/void-packages/pull/21701

wine: enable build for x86_64-musl
None

A patch file from https://github.com/void-linux/void-packages/pull/21701.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-musl-21701.patch --]
[-- Type: text/x-diff, Size: 1190 bytes --]

From d40fe56c5ed62cf9d575e8cd71a89d4cc5043457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 May 2020 20:06:03 +0200
Subject: [PATCH] wine: enable build for x86_64-musl

---
 srcpkgs/wine/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bc92a0eb454..8318e9b6af2 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=16c99b9c6db56f75fcc2c6b3cbae400db1da1f750edba0249fd0fc288a9b4712
 
 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}"
 

Re: [wip] wine: enable build for x86_64-musl

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21701#issuecomment-624910468

Comment:
Also tested quickly on i686-musl, it seems to break the dynamic linking of musl.

stacktrace of running `tools/winebuild/winebuild`
```
#0  0xf7fbf699 in do_relocs (dso=dso@entry=0xf7ffcc00 <app>, rel=0x5655591c, rel_size=1784, stride=stride@entry=2) at ldso/dynlink.c:423
#1  0xf7fc0703 in reloc_all (p=p@entry=0xf7ffcc00 <app>) at ldso/dynlink.c:1327
#2  0xf7fc215e in __dls3 (sp=<optimized out>) at ldso/dynlink.c:1906
#3  0xf7fc1c59 in __dls2 (base=<optimized out>, sp=<optimized out>) at ldso/dynlink.c:1650
#4  0xf7fc522a in _dlstart ()
```

Re: [PR PATCH] [Updated] [wip] wine: enable build for x86_64-musl

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages wine-musl
https://github.com/void-linux/void-packages/pull/21701

[wip] wine: enable build for x86_64-musl
mpv.exe runs fine

A patch file from https://github.com/void-linux/void-packages/pull/21701.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-musl-21701.patch --]
[-- Type: text/x-diff, Size: 2540 bytes --]

From f7879720ac2584a2de03eca13b9b8a8422d3f2e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
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}"
 

Re: wine: enable build for x86_64-musl

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21701#issuecomment-628287141

Comment:
@Hoshpak I made a slight change to the wine script to just print that only 64bit applications are supported under musl, instead of talking about enabling the multilib repo.

Re: wine: enable build for x86_64-musl

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21701#issuecomment-628287141

Comment:
@Hoshpak I made a slight change to the wine script to just print that only 64bit applications are supported under musl, instead of talking about enabling the multilib repo. Should be fine to get merged if you don't have any objections.

Re: wine: enable build for x86_64-musl

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/21701#issuecomment-628488178

Comment:
:shipit: 

Re: [PR PATCH] [Merged]: wine: enable build for x86_64-musl

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

There's a merged pull request on the void-packages repository

wine: enable build for x86_64-musl
https://github.com/void-linux/void-packages/pull/21701

Description:
mpv.exe runs fine