Merge pull request #1087 from LLNL/bugfix/new-harfbuzz-fix
Bugfix/new harfbuzz fix
This commit is contained in:
commit
bbe2db5814
@ -24,8 +24,10 @@
|
||||
##############################################################################
|
||||
from spack import *
|
||||
|
||||
|
||||
class Cairo(Package):
|
||||
"""Cairo is a 2D graphics library with support for multiple output devices."""
|
||||
"""Cairo is a 2D graphics library with support for multiple output
|
||||
devices."""
|
||||
homepage = "http://cairographics.org"
|
||||
url = "http://cairographics.org/releases/cairo-1.14.0.tar.xz"
|
||||
|
||||
@ -34,6 +36,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):
|
||||
|
@ -24,6 +24,7 @@
|
||||
##############################################################################
|
||||
from spack import *
|
||||
|
||||
|
||||
class Freetype(Package):
|
||||
"""Font package"""
|
||||
homepage = "http://http://www.freetype.org"
|
||||
@ -34,7 +35,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")
|
||||
|
@ -24,6 +24,7 @@
|
||||
##############################################################################
|
||||
from spack import *
|
||||
|
||||
|
||||
class Harfbuzz(Package):
|
||||
"""The Harfbuzz package contains an OpenType text shaping engine."""
|
||||
homepage = "http://www.freedesktop.org/wiki/Software/HarfBuzz/"
|
||||
@ -34,6 +35,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')
|
||||
|
@ -203,8 +203,10 @@ def python_ignore(self, ext_pkg, args):
|
||||
r'site-packages/site[^/]*\.pyc?$',
|
||||
r'site-packages/__pycache__/site[^/]*\.pyc?$'
|
||||
])
|
||||
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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user