* [PR PATCH] wine: make it work on i686-musl.
@ 2020-12-28 19:58 ericonr
2020-12-28 19:59 ` ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: ericonr @ 2020-12-28 19:58 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: wine: make it work on i686-musl.
2020-12-28 19:58 [PR PATCH] wine: make it work on i686-musl ericonr
@ 2020-12-28 19:59 ` ericonr
2020-12-28 20:00 ` [PR PATCH] [Updated] " ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-28 19:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27508#issuecomment-751846350
Comment:
@pullmoll might be interested?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] wine: make it work on i686-musl.
2020-12-28 19:58 [PR PATCH] wine: make it work on i686-musl ericonr
2020-12-28 19:59 ` ericonr
@ 2020-12-28 20:00 ` ericonr
2020-12-28 21:49 ` pullmoll
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-28 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
There is an updated 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: 2318 bytes --]
From 7aec763dbdaa79d7efbd2b246fe710ce143a3814 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.
Also xlint.
---
srcpkgs/wine/template | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 42592c677d9..c449db42b4a 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,8 +1,8 @@
# Template file for 'wine'
pkgname=wine
version=6.0rc4
-wrksrc=wine-${version/r/-r}
revision=1
+wrksrc=wine-${version/r/-r}
build_style=gnu-configure
configure_args="--bindir=/usr/libexec/wine"
short_desc="Run Microsoft Windows applications"
@@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: wine: make it work on i686-musl.
2020-12-28 19:58 [PR PATCH] wine: make it work on i686-musl ericonr
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
4 siblings, 0 replies; 6+ messages in thread
From: pullmoll @ 2020-12-28 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/27508#issuecomment-751874853
Comment:
LGTM but I don't use i686-musl myself. Only testing it every now an then in a VM.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] wine: make it work on i686-musl.
2020-12-28 19:58 [PR PATCH] wine: make it work on i686-musl ericonr
` (2 preceding siblings ...)
2020-12-28 21:49 ` pullmoll
@ 2020-12-29 4:23 ` ericonr
2020-12-29 6:18 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-29 4:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
There is an updated 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: 2515 bytes --]
From e08c8d62b5862a7eec3ca0c9d1986504f5e838a4 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.
Also xlint and disable tests under XBPS_CHECK_PKGS=yes.
---
srcpkgs/wine/template | 34 ++++++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 42592c677d9..dcc5a7cd043 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,8 +1,8 @@
# Template file for 'wine'
pkgname=wine
version=6.0rc4
-wrksrc=wine-${version/r/-r}
revision=1
+wrksrc=wine-${version/r/-r}
build_style=gnu-configure
configure_args="--bindir=/usr/libexec/wine"
short_desc="Run Microsoft Windows applications"
@@ -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,25 @@ 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 ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \
+ tools/{widl/widl,winebuild/winebuild,winegcc/winegcc,wrc/wrc} \
+ loader/wine server/wineserver
+ fi
+}
+
+do_check() {
+ if [ "$XBPS_CHECK_PKGS" = full ]; then
+ msg_warn "This testsuite might hang indefinitely\n"
+ make check
+ fi
+}
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -103,6 +130,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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: wine: make it work on i686-musl.
2020-12-28 19:58 [PR PATCH] wine: make it work on i686-musl ericonr
` (3 preceding siblings ...)
2020-12-29 4:23 ` [PR PATCH] [Updated] " ericonr
@ 2020-12-29 6:18 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-29 6:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
There's a merged pull request on the void-packages repository
wine: make it work on i686-musl.
https://github.com/void-linux/void-packages/pull/27508
Description:
-fno-PIC (wine build system) and pie by default (our toolchain) are a
bad match. Force -no-pie where necessary.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-29 6:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-28 19:58 [PR PATCH] wine: make it work on i686-musl ericonr
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
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).