From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] wine: make it work on i686-musl.
Date: Mon, 28 Dec 2020 20:58:44 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27508@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 431 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages wine-musl
https://github.com/void-linux/void-packages/pull/27508
wine: make it work on i686-musl.
-fno-PIC (wine build system) and pie by default (our toolchain) are a
bad match. Force -no-pie where necessary.
A patch file from https://github.com/void-linux/void-packages/pull/27508.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-musl-27508.patch --]
[-- Type: text/x-diff, Size: 2037 bytes --]
From 8e95e3560a6175962e73fd140e6a4b250928030f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 26 Dec 2020 23:54:31 -0300
Subject: [PATCH] wine: make it work on i686-musl.
-fno-PIC (wine build system) and pie by default (our toolchain) are a
bad match. Force -no-pie where necessary.
---
srcpkgs/wine/template | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 42592c677d9..0e1913df004 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -13,7 +13,15 @@ distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.
checksum=9dd7813918277d89ad3dbbd911eb1a7ada1c92778f17c727ca3a9fba591c7ec5
lib32mode=full
-archs="i686 x86_64*"
+archs="i686* x86_64*"
+
+_nopie=no
+if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
+ # build system adds -fno-PIC for 32bit builds, which,
+ # coupled with our default pie toolchain, leads to textrels
+ # in the final binary; musl doesn't support those
+ _nopie=yes
+fi
hostmakedepends="pkg-config flex gettext"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
@@ -47,6 +55,18 @@ fi
_wine_libexec="/usr/libexec/wine"
nopie_files="${_wine_libexec}/wine${_wine_suffix}"
+if [ "${_nopie}" = yes ]; then
+ nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
+fi
+
+pre_build() {
+ if [ "${_nopie}" = yes ]; then
+ make LDFLAGS="$LDFLAGS -no-pie" \
+ tools/{widl/widl,winebuild/winebuild,winegcc/winegcc,wrc/wrc} \
+ loader/wine server/wineserver
+ fi
+}
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -103,6 +123,9 @@ wine-common_package() {
wine-tools_package() {
depends="wine-${version}_${revision}"
short_desc+=" - development tools"
+ if [ "${_nopie}" = yes ]; then
+ nopie=yes
+ fi
pkg_install() {
for file in widl winebuild winecpp winedump wineg++ winegcc winemaker wmc wrc function_grep.pl
do
next reply other threads:[~2020-12-28 19:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 19:58 ericonr [this message]
2020-12-28 19:59 ` ericonr
2020-12-28 20:00 ` [PR PATCH] [Updated] " ericonr
2020-12-28 21:49 ` pullmoll
2020-12-29 4:23 ` [PR PATCH] [Updated] " ericonr
2020-12-29 6:18 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27508@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).