diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-08-13 16:09:27 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-08-17 00:11:44 -0400 |
| commit | af6bcb48d777f683384d9b8497e1b0edba5b16e7 (patch) | |
| tree | c80ce74f9f0611dedb9d21e9d15176a269ceb69b /tests/scanner/Makefile.am | |
| parent | 19db6454c48b6d8e4a0f033cf6c1d2b4be66f6c7 (diff) | |
| download | gobject-introspection-af6bcb48d777f683384d9b8497e1b0edba5b16e7.tar.gz | |
Resolve library names to shared libraries ourselves
Using ctypes.util.find_library() to resolve library names to
sonames causes problems with dealing with uninstalled libtool
operation properly. We're unlikely to find any way of combining
the two that will be robust against future changes in both
facilities.
Switch to a different approach - run 'ldd' on the compiled
introspection binary and extract sonames from there This is
less portable but should be quite robust where it works.
utils.py dumper.py: Move libtool-command-line finding into utils.py
girwriter.py: Remove library name resolution from here, expect libraries
to be passed in preresolved.
shlibs.py scannermain.py: New file including resolve_shlibs() to resolve
library names using the introspection binary.
tests/scanner/Makefile.am: Add .libs to LD_LIBRARY_PATH
http://bugzilla.gnome.org/show_bug.cgi?id=591669
Diffstat (limited to 'tests/scanner/Makefile.am')
| -rw-r--r-- | tests/scanner/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index ed8d3968..36aedbf7 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -143,10 +143,10 @@ post-check: @true %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir.check: %.tgir @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ |