hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glib: fix glib dependency build fixes #9992 (#12153)

Browse source 
add rpaths for glib config and py-pygobject build
This commit is contained in:
Gregory Lee 2019-08-02 13:18:04 -07:00 committed by Greg Becker
parent 9dd61f5313
commit 214b67066e
3 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/glib/package.py
View file

@ -145,3 +145,18 @@ def filter_sbang(self):
files = [join_path(self.prefix.bin, file) for file in files]
filter_file(pattern, repl, *files, backup=False)
@run_after('install')
def gettext_libdir(self):
# Packages that link to glib were also picking up -lintl from glib's
# glib-2.0.pc file. However, packages such as py-pygobject were
# bypassing spack's compiler wrapper for linking and thus not finding
# the gettext library directory. The patch below explitly adds the
# appropriate -L path.
spec = self.spec
if spec.satisfies('@2:2.99'):
pattern = 'Libs:'
repl = 'Libs: -L{0} -Wl,-rpath={0} '.format(
spec['gettext'].prefix.lib)
myfile = join_path(self.prefix.lib.pkgconfig, 'glib-2.0.pc')
filter_file(pattern, repl, myfile, backup=False)

6
var/spack/repos/builtin/packages/py-pygobject/package.py
View file

@ -35,6 +35,12 @@ class PyPygobject(PythonPackage):
# for https://bugzilla.gnome.org/show_bug.cgi?id=668522
patch('pygobject-2.28.6-gio-types-2.32.patch', when='@2.28.6')
# pygobject links directly using the compiler, not spack's wrapper.
# This causes it to fail to add the appropriate rpaths. This patch modifies
# pygobject's setup.py file to add -Wl,-rpath arguments for dependent
# libraries found with pkg-config.
patch('pygobject-3.28.3-setup-py.patch', when='@3.28.3')
def url_for_version(self, version):
url = 'http://ftp.gnome.org/pub/GNOME/sources/pygobject'
return url + '/%s/pygobject-%s.tar.xz' % (version.up_to(2), version)

23
var/spack/repos/builtin/packages/py-pygobject/pygobject-3.28.3-setup-py.patch Normal file
View file

@ -0,0 +1,23 @@
*** spack-src/setup.py Tue Jul 30 07:25:06 2019
--- spack-src/setup.py.new Tue Jul 30 07:44:00 2019
***************
*** 620,627 ****
min_version = get_version_requirement(script_dir, name)
pkg_config_version_check(name, min_version)
ext.include_dirs += pkg_config_parse("--cflags-only-I", name)
ext.library_dirs += pkg_config_parse("--libs-only-L", name)
ext.libraries += pkg_config_parse("--libs-only-l", name)
du_build_ext = get_command_class("build_ext")
--- 620,629 ----
min_version = get_version_requirement(script_dir, name)
pkg_config_version_check(name, min_version)
ext.include_dirs += pkg_config_parse("--cflags-only-I", name)
ext.library_dirs += pkg_config_parse("--libs-only-L", name)
ext.libraries += pkg_config_parse("--libs-only-l", name)
+ for libdir in ext.library_dirs:
+ ext.extra_link_args.append('-Wl,-rpath=%s' %libdir)
du_build_ext = get_command_class("build_ext")