From 4397ce8118a44fae4bef2b2ddcdfa3377922563f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 18 Feb 2017 16:42:45 -0600 Subject: [PATCH] Replace GCC-specific warning flags with valid PGI flags (#3137) --- var/spack/repos/builtin/packages/bzip2/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index d12b88e734d..e4b24637841 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -36,6 +36,7 @@ class Bzip2(Package): url = "http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" version('1.0.6', '00b516f4704d4a7cb50a1d97e6e8e15b') + variant('shared', default=True, description='Enables the build of shared libraries.') def patch(self): @@ -44,6 +45,11 @@ def patch(self): filter_file(r'^CC=gcc', 'CC=cc', 'Makefile') filter_file(r'^CC=gcc', 'CC=cc', 'Makefile-libbz2_so') + # The Makefiles use GCC flags that are incompatible with PGI + if self.compiler.name == 'pgi': + filter_file('-Wall -Winline', '-Minform=inform', 'Makefile') + filter_file('-Wall -Winline', '-Minform=inform', 'Makefile-libbz2_so') # noqa + # Patch the link line to use RPATHs on macOS if 'darwin' in self.spec.architecture: v = self.spec.version