Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
bfedeada
Commit
bfedeada
authored
9 years ago
by
Todd Gamblin
Committed by
GitHub
9 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1031 from opoplawski/pcre
Add patch to compile pcre with Intel 16.0.3 compiler
parents
a19c8b34
454acf58
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
var/spack/repos/builtin/packages/pcre/intel.patch
+12
-0
12 additions, 0 deletions
var/spack/repos/builtin/packages/pcre/intel.patch
var/spack/repos/builtin/packages/pcre/package.py
+3
-0
3 additions, 0 deletions
var/spack/repos/builtin/packages/pcre/package.py
with
15 additions
and
0 deletions
var/spack/repos/builtin/packages/pcre/intel.patch
0 → 100644
+
12
−
0
View file @
bfedeada
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__)
This diff is collapsed.
Click to expand it.
var/spack/repos/builtin/packages/pcre/package.py
+
3
−
0
View file @
bfedeada
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
##############################################################################
##############################################################################
from
spack
import
*
from
spack
import
*
class
Pcre
(
Package
):
class
Pcre
(
Package
):
"""
The PCRE package contains Perl Compatible Regular Expression
"""
The PCRE package contains Perl Compatible Regular Expression
libraries. These are useful for implementing regular expression
libraries. These are useful for implementing regular expression
...
@@ -34,6 +35,8 @@ class Pcre(Package):
...
@@ -34,6 +35,8 @@ class Pcre(Package):
version(
'
8.36
'
,
'
b767bc9af0c20bc9c1fe403b0d41ad97
'
)
version(
'
8.36
'
,
'
b767bc9af0c20bc9c1fe403b0d41ad97
'
)
version(
'
8.38
'
,
'
00aabbfe56d5a48b270f999b508c5ad2
'
)
version(
'
8.38
'
,
'
00aabbfe56d5a48b270f999b508c5ad2
'
)
patch(
"
intel
.
patch
"
)
def install(self, spec, prefix):
def install(self, spec, prefix):
configure(
"
--
prefix
=%
s
"
% prefix)
configure(
"
--
prefix
=%
s
"
% prefix)
make()
make()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment