Skip to content

Commit

Permalink
fixes to get python extensions to build properly
Browse files Browse the repository at this point in the history
  • Loading branch information
lee218llnl committed Jun 16, 2016
1 parent c803f7a commit af98e27
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/cairo/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Cairo(Package):
depends_on("libpng")
depends_on("glib")
depends_on("pixman")
depends_on("freetype")
depends_on("fontconfig@2.10.91:") # Require newer version of fontconfig.

def install(self, spec, prefix):
Expand Down
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/freetype/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Freetype(Package):
depends_on('libpng')

def install(self, spec, prefix):
configure("--prefix=%s" % prefix)
configure("--prefix=%s" % prefix, "--with-harfbuzz=no")

make()
make("install")
2 changes: 2 additions & 0 deletions var/spack/repos/builtin/packages/harfbuzz/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class Harfbuzz(Package):
depends_on("glib")
depends_on("icu")
depends_on("freetype")
depends_on("cairo")
depends_on("zlib")

def patch(self):
change_sed_delimiter('@', ';', 'src/Makefile.in')
Expand Down
3 changes: 3 additions & 0 deletions var/spack/repos/builtin/packages/python/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,11 @@ def python_ignore(self, ext_pkg, args):
patterns.append(r'setuptools\.pth')
patterns.append(r'bin/easy_install[^/]*$')
patterns.append(r'setuptools.*egg$')
if ext_pkg.name != 'py-pygments':
patterns.append(r'bin/pygmentize$')
if ext_pkg.name != 'py-numpy':
patterns.append(r'bin/f2py$')
patterns.append(r'bin/f2py3$')

return match_predicate(ignore_arg, patterns)

Expand Down

0 comments on commit af98e27

Please sign in to comment.