[gentoo-commits] repo/gentoo:master commit in: net-misc/nx/, net-misc/nx/files/

[Lars Wendler]

commit:     1121bce8ec9678ca7f29d39cfea002dbee75327e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 12:25:38 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 12:37:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1121bce8

net-misc/nx: Fixed build with binutils-2.36

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch | 42 ++++++++++++++++++++++
 net-misc/nx/nx-3.5.99.26.ebuild                    |  5 +++
 2 files changed, 47 insertions(+)

diff --git a/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch b/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch
new file mode 100644
index 00000000000..ec2925da979
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch
@@ -0,0 +1,42 @@
+From d35eba919c229cecf3c52a7dd034b9cd6b120ede Mon Sep 17 00:00:00 2001
+From: ponce <matteo.bernardini@×××××.com>
+Date: Mon, 5 Apr 2021 08:44:00 +0200
+Subject: [PATCH] fix building with binutils >= 2.36.
+
+The l option of ar in the newer binutils versions switched
+from being unused to being used to specify dependencies
+so here should be safely removed
+---
+ nx-X11/config/cf/Imake.tmpl | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
+index 25d985d75f..de1fca937e 100644
+--- a/nx-X11/config/cf/Imake.tmpl
++++ b/nx-X11/config/cf/Imake.tmpl
+@@ -1015,25 +1015,13 @@ TCLIBDIR = TclLibDir
+ #define ArCmdBase ar
+ #endif
+ #ifndef ArCmd
+-#if HasLargeTmp || SystemV4
+ #define ArCmd ArCmdBase cq
+-#else
+-#define ArCmd ArCmdBase clq
+-#endif
+ #endif
+ #ifndef ArAddCmd
+-#if HasLargeTmp || SystemV4
+ #define ArAddCmd ArCmdBase ru
+-#else
+-#define ArAddCmd ArCmdBase rul
+-#endif
+ #endif
+ #ifndef ArExtCmd
+-#if HasLargeTmp || SystemV4
+ #define ArExtCmd ArCmdBase x
+-#else
+-#define ArExtCmd ArCmdBase xl
+-#endif
+ #endif
+ #ifndef BootstrapCFlags
+ #define BootstrapCFlags /**/

diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 428f571e7e7..17d9b3f5472 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -43,6 +43,11 @@ BDEPEND="
 
 S="${WORKDIR}/nx-libs-${PV}"
 
+PATCHES=(
+	# https://github.com/ArcticaProject/nx-libs/pull/1012
+	"${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch"
+)
+
 src_prepare() {
 	default