diff options
Diffstat (limited to 'x11-misc/util-macros')
| -rw-r--r-- | x11-misc/util-macros/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch | 33 | ||||
| -rw-r--r-- | x11-misc/util-macros/util-macros-1.19.2-r2.ebuild (renamed from x11-misc/util-macros/util-macros-1.19.2-r1.ebuild) | 5 |
3 files changed, 39 insertions, 2 deletions
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest index 0f420192d4aa..694578223b5e 100644 --- a/x11-misc/util-macros/Manifest +++ b/x11-misc/util-macros/Manifest @@ -1,3 +1,4 @@ +AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619 -EBUILD util-macros-1.19.2-r1.ebuild 717 BLAKE2B fe4f82c7c5583455f25b286236c0a77ca1cc9f96636a566b39a0a1fb3441aee054ee66125ca250e21ecdc06a0f17afd682ef25bdc4c1f2fae78f2d7936ccdcbe SHA512 ddd5dddec1ab2dcd226b6dd43423c83e4c763c99b79ec661fd11d750daa08374eb701a7b949edc9e410a433dd857dc7234f507ab0e16216f36bdfc8cd433737f +EBUILD util-macros-1.19.2-r2.ebuild 752 BLAKE2B 949a81950949fa68bdda6f73a955d2eacc684807164837dc27bb604f921158752e4ae2363022819609d8fb5381e3c84168338dfd1874478c8e993e41b60e8b34 SHA512 f0abd0adac3913bf44fcbf168a8bfb557d1c5e95890733b2f6a89a42e5f4ad5667e8dc6ea153976310310f857b389ecc1016fac59eb8da973aed2b64c835e4f5 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 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-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild index 26b75243fcd4..81fcaa3a9e9a 100644 --- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild +++ b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild @@ -10,7 +10,10 @@ 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 |