x11-misc/util-macros: lookup tool-prefixed 'cpp'

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/726130
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

2 files changed, 54 insertions, 0 deletions

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
new file mode 100644
index 000000000000..e6cbee98d11c
--- /dev/null
+++ b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/726130
+
+From bd66ce3ba4a9d1d1490cb5775a2fdd0b408879b6 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Fri, 27 May 2016 15:13:56 +0200
+Subject: [PATCH util/macros] XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find
+ preprocessor
+
+On some distributions tools like cpp are prefixed with the host-triple,
+to check for this prefixed version first AC_PATH_TOOL should be used. If
+no prefixed cpp, it will fallback to the unprefixed name.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96257
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ xorg-macros.m4.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/xorg-macros.m4.in
++++ b/xorg-macros.m4.in
+@@ -57,7 +57,7 @@ m4_undefine([maj_needed])
+ # such as man pages and config files
+ AC_DEFUN([XORG_PROG_RAWCPP],[
+ AC_REQUIRE([AC_PROG_CPP])
+-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
++AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
+    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+ 
+ # Check for flag to avoid builtin definitions - assumes unix is predefined,
+-- 
+2.27.0
+
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
new file mode 100644
index 000000000000..5a5659f8bc37
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.Org autotools utility macros"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros"
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CPP.patch
+)
+
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+src_compile() { true; }