summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <sudinave@gmail.com>2021-04-13 23:15:46 -0400
committerJoonas Niilola <juippis@gentoo.org>2021-04-15 09:38:49 +0300
commit56fe2a2033eb3683c487a14e60f3eb130bc7c61f (patch)
treef71296329d10d491159787563661443ee606cec6 /x11-misc/xorg-cf-files
parentx11-misc/imake: minor cleanups (diff)
downloadgentoo-56fe2a2033eb3683c487a14e60f3eb130bc7c61f.tar.gz
gentoo-56fe2a2033eb3683c487a14e60f3eb130bc7c61f.tar.bz2
gentoo-56fe2a2033eb3683c487a14e60f3eb130bc7c61f.zip
x11-misc/xorg-cf-files: remove ar l for binutils-2.36
l is a non-POSIX extension that for some implementation of ar(1) does: "puts any temporary files that ar generates in the current directory rather than the default temporary file directory." In <=binutils-2.35 it was instead silently ignored, but 2.36: "The ar tool's previously unused l modifier is now used for specifying dependencies of a static library." Which now caused build failures in some imake-using packages. Closes: https://bugs.gentoo.org/782514 Signed-off-by: Ionen Wolkens <sudinave@gmail.com> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'x11-misc/xorg-cf-files')
-rw-r--r--x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch20
-rw-r--r--x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild (renamed from x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild)1
2 files changed, 21 insertions, 0 deletions
diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
new file mode 100644
index 000000000000..52e07f319544
--- /dev/null
+++ b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
@@ -0,0 +1,20 @@
+l argument was formerly ignored by binutils, but since 2.36 is used
+for something other than what was intended here (tmp files location).
+https://bugs.gentoo.org/782514
+--- a/Imake.tmpl
++++ b/Imake.tmpl
+@@ -1083,3 +1083,3 @@
+ #else
+-#define ArCmd ArCmdBase clq
++#define ArCmd ArCmdBase cq
+ #endif
+@@ -1090,3 +1090,3 @@
+ #else
+-#define ArAddCmd ArCmdBase rul
++#define ArAddCmd ArCmdBase ru
+ #endif
+@@ -1097,3 +1097,3 @@
+ #else
+-#define ArExtCmd ArCmdBase xl
++#define ArExtCmd ArCmdBase x
+ #endif
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
index b674d2cf2e0a..c44c96e2fa9e 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
@@ -21,6 +21,7 @@ RDEPEND=""
DEPEND="${RDEPEND}"
PATCHES=(
+ "${FILESDIR}"/${P}-no-ar-l.patch
"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
)