From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48CAB15800A for ; Thu, 10 Aug 2023 21:15:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C6CD2BC016; Thu, 10 Aug 2023 21:15:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F39C2BC016 for ; Thu, 10 Aug 2023 21:15:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 434CA335DC8 for ; Thu, 10 Aug 2023 21:15:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C184F35 for ; Thu, 10 Aug 2023 21:14:58 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1691702077.6cdc5b79f51fbbbbd9fc6dd436bb2cd5d5a8f17e.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/, app-emulation/wine-staging/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch app-emulation/wine-staging/wine-staging-8.13.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/files/ app-emulation/wine-staging/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6cdc5b79f51fbbbbd9fc6dd436bb2cd5d5a8f17e X-VCS-Branch: master Date: Thu, 10 Aug 2023 21:14:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab4def6c-5955-4f49-bc8d-9941ff4ba786 X-Archives-Hash: 257b31ec9325d204bf3097294dfeaa8b commit: 6cdc5b79f51fbbbbd9fc6dd436bb2cd5d5a8f17e Author: Violet Purcell inventati org> AuthorDate: Thu Aug 10 20:37:20 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Aug 10 21:14:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdc5b79 app-emulation/wine-staging: Fix rpath bug on musl Signed-off-by: Violet Purcell inventati.org> Closes: https://github.com/gentoo/gentoo/pull/32250 Signed-off-by: Ionen Wolkens gentoo.org> .../wine-staging/files/wine-staging-8.13-rpath.patch | 15 +++++++++++++++ app-emulation/wine-staging/wine-staging-8.13.ebuild | 1 + app-emulation/wine-staging/wine-staging-9999.ebuild | 1 + 3 files changed, 17 insertions(+) diff --git a/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch new file mode 100644 index 000000000000..5f0d63b0ec33 --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch @@ -0,0 +1,15 @@ +Patch Source: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/wine/rpath.patch +Alpine Bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249 + +--- a/configure.ac ++++ b/configure.ac +@@ -784,6 +784,9 @@ case $host_os in + [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) + ;; + esac ++ ++ # do this at the end because it needs double dollar for makefile ++ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"]) + ;; + esac + diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild b/app-emulation/wine-staging/wine-staging-8.13.ebuild index d27aaaf1b5d2..4f0b643cf1f6 100644 --- a/app-emulation/wine-staging/wine-staging-8.13.ebuild +++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild @@ -160,6 +160,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch + "${FILESDIR}"/${PN}-8.13-rpath.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index d27aaaf1b5d2..4f0b643cf1f6 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -160,6 +160,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.17-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch + "${FILESDIR}"/${PN}-8.13-rpath.patch ) pkg_pretend() {