diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-15 08:56:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 08:56:53 -0700 |
| commit | bfedeadacb22e9166bdf9ed20892998a5ea64445 (patch) | |
| tree | d9ad9e10ee53ba5a491fe96ba9adf97522e20db4 | |
| parent | a19c8b343e98e820b8226528f569911f04c8d2e6 (diff) | |
| parent | 454acf58af0ea22b6f14f7527226234303d40e99 (diff) | |
| download | spack-bfedeadacb22e9166bdf9ed20892998a5ea64445.tar.gz spack-bfedeadacb22e9166bdf9ed20892998a5ea64445.tar.bz2 spack-bfedeadacb22e9166bdf9ed20892998a5ea64445.tar.xz spack-bfedeadacb22e9166bdf9ed20892998a5ea64445.zip | |
Merge pull request #1031 from opoplawski/pcre
Add patch to compile pcre with Intel 16.0.3 compiler
| -rw-r--r-- | var/spack/repos/builtin/packages/pcre/intel.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pcre/package.py | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/pcre/intel.patch b/var/spack/repos/builtin/packages/pcre/intel.patch new file mode 100644 index 0000000000..f160f55e1b --- /dev/null +++ b/var/spack/repos/builtin/packages/pcre/intel.patch @@ -0,0 +1,12 @@ +diff -up pcre-8.38/pcrecpp.cc.intel pcre-8.38/pcrecpp.cc +--- pcre-8.38/pcrecpp.cc.intel 2014-09-15 07:48:59.000000000 -0600 ++++ pcre-8.38/pcrecpp.cc 2016-06-08 16:16:56.702721214 -0600 +@@ -66,7 +66,7 @@ Arg RE::no_arg((void*)NULL); + // inclusive test if we ever needed it. (Note that not only the + // __attribute__ syntax, but also __USER_LABEL_PREFIX__, are + // gnu-specific.) +-#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) ++#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) && !defined(__INTEL_COMPILER) + # define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x) + # define ULP_AS_STRING_INTERNAL(x) #x + # define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__) diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py index 7a9f3b911d..8e0f83110e 100644 --- a/var/spack/repos/builtin/packages/pcre/package.py +++ b/var/spack/repos/builtin/packages/pcre/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * + class Pcre(Package): """The PCRE package contains Perl Compatible Regular Expression libraries. These are useful for implementing regular expression @@ -34,6 +35,8 @@ class Pcre(Package): version('8.36', 'b767bc9af0c20bc9c1fe403b0d41ad97') version('8.38', '00aabbfe56d5a48b270f999b508c5ad2') + patch("intel.patch") + def install(self, spec, prefix): configure("--prefix=%s" % prefix) make() |