zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: set STRIP on macOS (#19677)

Browse Source 
* at-spi2-core: add new version

* Add strip hacks

* meson: set STRIP on macOS
This commit is contained in:
Adam J. Stewart 2020-11-06 17:34:47 -06:00 committed by GitHub
parent a3854700fb
commit 319c4f2e9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/at-spi2-core/package.py
View File

@ -12,13 +12,15 @@ class AtSpi2Core(MesonPackage):
against which applications can be linked.""" against which applications can be linked."""
homepage = "http://www.linuxfromscratch.org/blfs/view/cvs/x/at-spi2-core.html" 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_url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core"
list_depth = 1 list_depth = 1
version('2.38.0', sha256='84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5')
version('2.36.0', sha256='88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a') version('2.36.0', sha256='88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a')
version('2.28.0', sha256='42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87') version('2.28.0', sha256='42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87')
depends_on('meson@0.46.0:', type='build')
depends_on('glib@2.56.1:') depends_on('glib@2.56.1:')
depends_on('dbus@1.12.8:') depends_on('dbus@1.12.8:')
depends_on('gettext') depends_on('gettext')

5
var/spack/repos/builtin/packages/glib/package.py
View File

@ -171,11 +171,6 @@ def configure_args(self):
args.append('GTKDOC_REBASE={0}'.format(true)) args.append('GTKDOC_REBASE={0}'.format(true))
return args 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') @when('@:2.57.99')
def install(self, spec, prefix): def install(self, spec, prefix):
configure('--prefix={0}'.format(prefix), *self.configure_args()) configure('--prefix={0}'.format(prefix), *self.configure_args())

5
var/spack/repos/builtin/packages/meson/package.py
View File

@ -48,3 +48,8 @@ class Meson(PythonPackage):
@classmethod @classmethod
def determine_version(cls, exe): def determine_version(cls, exe):
return Executable(exe)('--version', output=str, error=str).rstrip() 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')