diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2021-05-31 10:42:20 +0200 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2021-05-31 10:42:20 +0200 |
commit | 684579cabe8b97ec395650d1ec892b9ad9796dd2 (patch) | |
tree | 97039cbeebe1f6b83a3a97bc756a3dc69bb62984 /dev-ada/gprbuild | |
parent | app-emacs/mic-paren: Remove old (diff) | |
download | gentoo-684579cabe8b97ec395650d1ec892b9ad9796dd2.tar.gz gentoo-684579cabe8b97ec395650d1ec892b9ad9796dd2.tar.bz2 gentoo-684579cabe8b97ec395650d1ec892b9ad9796dd2.zip |
dev-ada/gprbuild: fix gnat discovery
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Diffstat (limited to 'dev-ada/gprbuild')
-rw-r--r-- | dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 8 | ||||
-rw-r--r-- | dev-ada/gprbuild/gprbuild-2021-r1.ebuild (renamed from dev-ada/gprbuild/gprbuild-2021.ebuild) | 0 |
2 files changed, 7 insertions, 1 deletions
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch index ac61f561785b..15264d6828e6 100644 --- a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch @@ -65,7 +65,7 @@ <grep regexp="[^\r\n]+"></grep> </target> </compiler_description> -@@ -185,9 +185,9 @@ +@@ -185,14 +185,14 @@ --> <compiler_description> <name>GNAT</name> @@ -77,6 +77,12 @@ <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> </version> <languages>Ada</languages> + <variable name="gcc_version"> +- <external>${PREFIX}gcc -v</external> ++ <external>${PREFIX}gcc-@VER@ -v</external> + <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> + </variable> + <runtimes default="default,kernel,native"> @@ -202,68 +202,11 @@ <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory> </runtimes> diff --git a/dev-ada/gprbuild/gprbuild-2021.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild index 02f4c0558a5c..02f4c0558a5c 100644 --- a/dev-ada/gprbuild/gprbuild-2021.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild |