From 89cca23840f67d618d05acac1fb61d1b85f350a6 Mon Sep 17 00:00:00 2001
From: "Nichols A. Romero" <naromero77@users.noreply.github.com>
Date: Thu, 24 Sep 2020 11:27:43 -0500
Subject: Classic Flang Master Update (#18748)

* Flang master branch is now the preferred version.

* Flang master branch can now use LLVM 9

* Remove master as this was never used by Flang.

* Add LLVM-Flang release_90 and release_90.
---
 var/spack/repos/builtin/packages/flang/package.py  |  4 ++--
 .../repos/builtin/packages/llvm-flang/package.py   | 25 +++++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py
index 4fd754eab3..1f7d1e5da0 100644
--- a/var/spack/repos/builtin/packages/flang/package.py
+++ b/var/spack/repos/builtin/packages/flang/package.py
@@ -18,7 +18,7 @@ class Flang(CMakePackage, CudaPackage):
 
     maintainers = ['naromero77']
 
-    version('master', branch='master')
+    version('master', branch='master', preferred=True)
     version('20190329', sha256='b8c621da53829f8c53bad73125556fb1839c9056d713433b05741f7e445199f2')
     version('20181226', sha256='00e716bea258c3bb60d6a5bb0c82bc79f67000062dc89939693e75f501883c36')
     version('20180921', sha256='f33bd1f054e474f1e8a204bb6f78d42f8f6ecf7a894fdddc3999f7c272350784')
@@ -33,7 +33,7 @@ class Flang(CMakePackage, CudaPackage):
     depends_on('cmake@3.8:', type='build')
     depends_on('python@2.7:', type='build')
 
-    depends_on('llvm-flang@release_70', when='@master')
+    depends_on('llvm-flang@release_90', when='@master')
     depends_on('llvm-flang@20190329', when='@20190329')
     depends_on('llvm-flang@20181226_70', when='@20181226')
     depends_on('llvm-flang@20180921', when='@20180921')
diff --git a/var/spack/repos/builtin/packages/llvm-flang/package.py b/var/spack/repos/builtin/packages/llvm-flang/package.py
index d5b9370169..04ab53d219 100644
--- a/var/spack/repos/builtin/packages/llvm-flang/package.py
+++ b/var/spack/repos/builtin/packages/llvm-flang/package.py
@@ -16,7 +16,8 @@ class LlvmFlang(CMakePackage, CudaPackage):
 
     maintainer = ['naromero77']
 
-    version('master', branch='master')
+    version('release_90', branch='release_90')
+    version('release_80', branch='release_80')
     version('release_70', branch='release_70')
     version('release_60', branch='release_60')
     version('20190329', tag='flang_20190329')
@@ -50,10 +51,17 @@ class LlvmFlang(CMakePackage, CudaPackage):
     # LLVM-Flang Componentes: Driver, OpenMP
     resource(name='flang-driver',
              git='https://github.com/flang-compiler/flang-driver.git',
-             branch='master',
+             branch='release_90',
              destination='tools',
              placement='clang',
-             when='@master')
+             when='@release_90')
+
+    resource(name='flang-driver',
+             git='https://github.com/flang-compiler/flang-driver.git',
+             branch='release_80',
+             destination='tools',
+             placement='clang',
+             when='@release_80')
 
     resource(name='flang-driver',
              git='https://github.com/flang-compiler/flang-driver.git',
@@ -104,12 +112,19 @@ class LlvmFlang(CMakePackage, CudaPackage):
              placement='clang',
              when='@20180308')
 
+    resource(name='openmp',
+             git='https://github.com/llvm-mirror/openmp.git',
+             branch='release_90',
+             destination='projects',
+             placement='openmp',
+             when='@release_90')
+
     resource(name='openmp',
              git='https://github.com/flang-compiler/openmp.git',
-             branch='master',
+             branch='release_80',
              destination='projects',
              placement='openmp',
-             when='@master')
+             when='@release_80')
 
     resource(name='openmp',
              git='https://github.com/flang-compiler/openmp.git',
-- 
cgit v1.2.3-70-g09d2