diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-misc/nx | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'net-misc/nx')
| -rw-r--r-- | net-misc/nx/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch | 42 | ||||
| -rw-r--r-- | net-misc/nx/nx-3.5.99.26.ebuild | 5 |
3 files changed, 49 insertions, 1 deletions
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 1964d59d3ae6..7f96cb230c4b 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -1,5 +1,6 @@ +AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211 EBUILD nx-3.5.99.25.ebuild 3399 BLAKE2B 8374b0636f45bbce371c9d2c08f0f87b25f85248a216ca3f7213b5a663952407237e8647e4099ba749efc5f114550ef05106ca18a5e502aad8ed7eb3c8233ef0 SHA512 f14f778992a7d4bc75656a99de471505703305f4d1ec66c11ec4694821d5d8f2746aa4a84ec1f9ffd522db230669a67df9dff43d6b16f90b0d2bf0baee55aade -EBUILD nx-3.5.99.26.ebuild 3401 BLAKE2B 3f2c31ca5f62445775437c11f2cf653fe8798b347b692c48fc068819717c28b2d71e10ecf001b902d04fa0302a33755c89f7237d642ba4074915c02418b8d6fc SHA512 02e60d8f07e1a23f520cb629e80947e6911ba9f7db906b1ff10f354aaa263b326d7648819a0e033777ce7e7a41cf7dfa5b8d339f0c2b589a20476339066be4ff +EBUILD nx-3.5.99.26.ebuild 3520 BLAKE2B 1ae7719c98dddc863f54152c08936ebf27c23cb0b74b77cbc06ee47ea7ea2d0e2c11edefe4beac15a8cdf84d0c27a8e89237387b917b18fa16c0e13503142745 SHA512 44eb366461b831386e5a8869f9a2443a8d207f54fe087c93bbe75a79a9e7b721171773f63ff53889575473337374eb09edca710e0547330ab7896438980d2b7b MISC metadata.xml 332 BLAKE2B 93930f64047301f8a393899de54a0d9294c7c17385b47fec5a2e402b2904bc88ae697e5b075e1defd723d8d251fd424e790e9b37b94bc48b10b395307e3830fd SHA512 005c90731093f7fc354297e981140415e33785492a1a835a5a5b8b68506d690679d6430ff0b05f6e3ce2ac763ea13cd68a599581a6037f16ac1974e6ad9d54a4 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 000000000000..ec2925da9790 --- /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@gmail.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 428f571e7e72..17d9b3f5472c 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 |