From a15f3e7cf997947dfcd9a7675e63793b96320621 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 Jul 2018 14:17:59 -0500
Subject: [PATCH 1/7] Remove -shared from EXTRA_LINK_ARGS. Closes #1 on gitlab.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a6cc75d..255a0c3 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@ def main():
     # https://groups.google.com/forum/#!topic/comp.lang.fortran/x3JnAjRX-KA
     os.environ["FOPT"] = "-std=legacy {}".format(FOPT_ARGS)
     os.environ["OPT"] = "-std=legacy {}".format(OPT_ARGS)
-    os.environ["EXTRA_LINK_ARGS"] = "-shared {}".format(EXTRA_LINK_ARGS)
+    os.environ["EXTRA_LINK_ARGS"] = EXTRA_LINK_ARGS
 
     try:
         import mako  # noqa
-- 
GitLab


From 9dcbc1a14ed3dd0b975a84b4cebcebd40ff4bafd Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 Jul 2018 14:20:25 -0500
Subject: [PATCH 2/7] Add Apple CI job

---
 .gitlab-ci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6fa117..667d878 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,3 +21,15 @@ Python 3.6:
   - gfortran
   except:
   - tags
+
+Python 2.7 Apple:
+  script:
+  - py_version=2.7
+  - EXTRA_INSTALL="numpy mako"
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
+  tags:
+  - apple
+  - python2.7
+  except:
+  - tags
-- 
GitLab


From b061c1c5a1505d71e230b4eba43706d37e03d869 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 Jul 2018 15:27:40 -0400
Subject: [PATCH 3/7] Use GCC 8

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 667d878..1b84f62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,8 @@ Python 2.7 Apple:
   script:
   - py_version=2.7
   - EXTRA_INSTALL="numpy mako"
+  - # for OpenMP support ('gcc' aliased to clang)
+  - CC=gcc-8
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
-- 
GitLab


From 9dc0739ebedc96d31cecd111a9c1ebd81685eb1a Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 Jul 2018 15:29:10 -0400
Subject: [PATCH 4/7] Remove comment

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b84f62..063b415 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ Python 2.7 Apple:
   script:
   - py_version=2.7
   - EXTRA_INSTALL="numpy mako"
-  - # for OpenMP support ('gcc' aliased to clang)
   - CC=gcc-8
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
-- 
GitLab


From 5c4be439608098f6afad014f59eb9c0e68683fb5 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 Jul 2018 14:44:14 -0500
Subject: [PATCH 5/7] Forgot export

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 063b415..fec2e29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ Python 2.7 Apple:
   script:
   - py_version=2.7
   - EXTRA_INSTALL="numpy mako"
-  - CC=gcc-8
+  - export CC=gcc-8
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
-- 
GitLab


From 6c9177d401ff3c18d375aaa11b79f91dd7c658da Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 Jul 2018 14:52:54 -0500
Subject: [PATCH 6/7] Give up trying to use OpenMP for Apple CI job

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fec2e29..14894b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ Python 2.7 Apple:
   script:
   - py_version=2.7
   - EXTRA_INSTALL="numpy mako"
-  - export CC=gcc-8
+  - export PYFMMLIB_BUILD_MODE=setuptools
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
-- 
GitLab


From fbe59eac30b305cb759f5854ad872568e940d182 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 17 Jul 2018 15:04:15 -0500
Subject: [PATCH 7/7] -std=legacy is not a C compiler flag

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 255a0c3..65da29f 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,8 @@ def main():
     # NOTE: gfortran 8.1+ errors on incorrect dummy argument shape
     # https://groups.google.com/forum/#!topic/comp.lang.fortran/x3JnAjRX-KA
     os.environ["FOPT"] = "-std=legacy {}".format(FOPT_ARGS)
-    os.environ["OPT"] = "-std=legacy {}".format(OPT_ARGS)
+
+    os.environ["OPT"] = OPT_ARGS
     os.environ["EXTRA_LINK_ARGS"] = EXTRA_LINK_ARGS
 
     try:
-- 
GitLab