From: Stephen L Arnold <nerdboy@gentoo.org>
Date: Tue, 14 Mar 2017 21:21:45 +0000 (-0700)
Subject: dev-lang/gnat-gcc: add missing patch for gnatbuild-r1
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a6aac9a2ab28c59f00a154cd61bd5c070f05bfd9;p=gentoo.git

dev-lang/gnat-gcc: add missing patch for gnatbuild-r1

This fixes bug 603790 - missing patch fail

Reported-by:  Michael Mounteney

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/dev-lang/gnat-gcc/files/gnat-gcc-4.9.3-make-default-paths-match-slot.patch b/dev-lang/gnat-gcc/files/gnat-gcc-4.9.3-make-default-paths-match-slot.patch
new file mode 100644
index 000000000000..0c197a15c134
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/gnat-gcc-4.9.3-make-default-paths-match-slot.patch
@@ -0,0 +1,27 @@
+--- gcc/Makefile.in.orig	2016-05-20 15:01:04.277726220 -0700
++++ gcc/Makefile.in	2016-05-20 18:40:43.658617109 -0700
+@@ -594,9 +594,9 @@
+ # --------
+ 
+ # Directory in which the compiler finds libraries etc.
+-libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version)
++libsubdir = $(libdir)/gnat-gcc/$(target_noncanonical)/SLOT_MARKER
+ # Directory in which the compiler finds executables
+-libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version)
++libexecsubdir = $(libexecdir)/gnat-gcc/$(target_noncanonical)/SLOT_MARKER
+ # Directory in which all plugin resources are installed
+ plugin_resourcesdir = $(libsubdir)/plugin
+  # Directory in which plugin headers are installed
+@@ -1944,9 +1944,9 @@
+ 
+ DRIVER_DEFINES = \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+-  -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
+-  -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
+-  -DDEFAULT_TARGET_VERSION=\"$(version)\" \
++  -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gnat-gcc/\" \
++  -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gnat-gcc/\" \
++  -DDEFAULT_TARGET_VERSION=\"SLOT_MARKER\" \
+   -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
+   -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
+   -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \