1 |
commit: 8172b34489455d1cb6d6abef0a0742a3d463e919 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 11 09:33:29 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 11 09:34:05 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8172b344 |
7 |
|
8 |
x11-misc/util-macros: lookup tool-prefixed 'cpp' |
9 |
|
10 |
Reported-by: Agostino Sarubbo |
11 |
Closes: https://bugs.gentoo.org/726130 |
12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
.../util-macros/files/util-macros-1.19.2-CPP.patch | 33 ++++++++++++++++++++++ |
16 |
x11-misc/util-macros/util-macros-1.19.2-r2.ebuild | 21 ++++++++++++++ |
17 |
2 files changed, 54 insertions(+) |
18 |
|
19 |
diff --git a/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..e6cbee98d11 |
22 |
--- /dev/null |
23 |
+++ b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch |
24 |
@@ -0,0 +1,33 @@ |
25 |
+https://bugs.gentoo.org/726130 |
26 |
+ |
27 |
+From bd66ce3ba4a9d1d1490cb5775a2fdd0b408879b6 Mon Sep 17 00:00:00 2001 |
28 |
+From: Marvin Schmidt <marv@×××××××.org> |
29 |
+Date: Fri, 27 May 2016 15:13:56 +0200 |
30 |
+Subject: [PATCH util/macros] XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find |
31 |
+ preprocessor |
32 |
+ |
33 |
+On some distributions tools like cpp are prefixed with the host-triple, |
34 |
+to check for this prefixed version first AC_PATH_TOOL should be used. If |
35 |
+no prefixed cpp, it will fallback to the unprefixed name. |
36 |
+ |
37 |
+https://bugs.freedesktop.org/show_bug.cgi?id=96257 |
38 |
+ |
39 |
+Signed-off-by: Alan Coopersmith <alan.coopersmith@××××××.com> |
40 |
+--- |
41 |
+ xorg-macros.m4.in | 2 +- |
42 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
43 |
+ |
44 |
+--- a/xorg-macros.m4.in |
45 |
++++ b/xorg-macros.m4.in |
46 |
+@@ -57,7 +57,7 @@ m4_undefine([maj_needed]) |
47 |
+ # such as man pages and config files |
48 |
+ AC_DEFUN([XORG_PROG_RAWCPP],[ |
49 |
+ AC_REQUIRE([AC_PROG_CPP]) |
50 |
+-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], |
51 |
++AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], |
52 |
+ [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) |
53 |
+ |
54 |
+ # Check for flag to avoid builtin definitions - assumes unix is predefined, |
55 |
+-- |
56 |
+2.27.0 |
57 |
+ |
58 |
|
59 |
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild |
60 |
new file mode 100644 |
61 |
index 00000000000..5a5659f8bc3 |
62 |
--- /dev/null |
63 |
+++ b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild |
64 |
@@ -0,0 +1,21 @@ |
65 |
+# Copyright 1999-2020 Gentoo Authors |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+ |
68 |
+EAPI=7 |
69 |
+ |
70 |
+DESCRIPTION="X.Org autotools utility macros" |
71 |
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros" |
72 |
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" |
73 |
+ |
74 |
+LICENSE="MIT" |
75 |
+SLOT="0" |
76 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
77 |
+IUSE="" |
78 |
+ |
79 |
+PATCHES=( |
80 |
+ "${FILESDIR}"/${P}-CPP.patch |
81 |
+) |
82 |
+ |
83 |
+# there is nothing to compile for this package, all its contents are produced by |
84 |
+# configure. the only make job that matters is make install |
85 |
+src_compile() { true; } |