diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-11-06 17:34:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 00:34:47 +0100 |
| commit | 319c4f2e9e499decb7e2cbb9c21a5ee3be663616 (patch) | |
| tree | 9c10607613caa64ddca1c40bee31d467e224d6ad /var | |
| parent | a3854700fb306c0dde6c3f5c4c6a594a367beb8f (diff) | |
| download | spack-319c4f2e9e499decb7e2cbb9c21a5ee3be663616.tar.gz spack-319c4f2e9e499decb7e2cbb9c21a5ee3be663616.tar.bz2 spack-319c4f2e9e499decb7e2cbb9c21a5ee3be663616.tar.xz spack-319c4f2e9e499decb7e2cbb9c21a5ee3be663616.zip | |
meson: set STRIP on macOS (#19677)
* at-spi2-core: add new version
* Add strip hacks
* meson: set STRIP on macOS
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/at-spi2-core/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/glib/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/meson/package.py | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/at-spi2-core/package.py b/var/spack/repos/builtin/packages/at-spi2-core/package.py index fef0afe848..6e23e901c8 100644 --- a/var/spack/repos/builtin/packages/at-spi2-core/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-core/package.py @@ -12,13 +12,15 @@ class AtSpi2Core(MesonPackage): against which applications can be linked.""" homepage = "http://www.linuxfromscratch.org/blfs/view/cvs/x/at-spi2-core.html" - url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.28/at-spi2-core-2.28.0.tar.xz" + url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.28/at-spi2-core-2.38.0.tar.xz" list_url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core" list_depth = 1 + version('2.38.0', sha256='84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5') version('2.36.0', sha256='88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a') version('2.28.0', sha256='42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87') + depends_on('meson@0.46.0:', type='build') depends_on('glib@2.56.1:') depends_on('dbus@1.12.8:') depends_on('gettext') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index b4bec94fee..786721565a 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -171,11 +171,6 @@ class Glib(Package): args.append('GTKDOC_REBASE={0}'.format(true)) return args - def setup_build_environment(self, env): - if self.spec.satisfies('platform=darwin'): - # https://github.com/pybind/pybind11/issues/595 - env.set('STRIP', 'strip -x') - @when('@:2.57.99') def install(self, spec, prefix): configure('--prefix={0}'.format(prefix), *self.configure_args()) diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index 405ea4c5a0..e60101d5bc 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -48,3 +48,8 @@ class Meson(PythonPackage): @classmethod def determine_version(cls, exe): return Executable(exe)('--version', output=str, error=str).rstrip() + + def setup_dependent_build_environment(self, env, dependent_spec): + # https://github.com/pybind/pybind11/issues/595 + if self.spec.satisfies('platform=darwin'): + env.set('STRIP', 'strip -x') |