Github messages for voidlinux
 help / color / mirror / Atom feed
From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] wine: enable build for x86_64-musl
Date: Wed, 06 May 2020 20:06:32 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21701@inbox.vuxu.org> (raw)

[-- 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}"
 

             reply	other threads:[~2020-05-06 18:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-06 18:06 Johnnynator [this message]
2020-05-06 21:51 ` [wip] " Johnnynator
2020-05-13 22:51 ` [PR PATCH] [Updated] " Johnnynator
2020-05-13 22:53 ` Johnnynator
2020-05-13 22:54 ` Johnnynator
2020-05-14  8:43 ` Hoshpak
2020-05-14 12:55 ` [PR PATCH] [Merged]: " Johnnynator

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-21701@inbox.vuxu.org \
    --to=johnnynator@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).