diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2014-10-06 16:30:39 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2014-10-06 18:58:11 +0100 |
| commit | 2faf5a8665bba9ab7ad64ac6aa8c13be8f176d7d (patch) | |
| tree | bb610ed56b5db8528ba166e1053fe11cd1add3b1 /tools/quick_dump | |
| parent | d4c1bb7aab2d2d7ed3eb3225f937f55f591f1ae4 (diff) | |
quick-dump: Make quick dump link against libintel_tools
Because quick-dump was only selecting a few files in lib/ and we move
stuff around and/or add new dependencies we were failing to provide the
necessary symbols to the shim library providing python bindings. And so
we had a run-time error:
Traceback (most recent call last):
File "./tools/quick_dump/quick_dump.py", line 17, in <module>
import chipset
File "/home/damien/gfx/sources/intel-gpu-tools/tools/quick_dump/chipset.py", line 28, in <module>
_chipset = swig_import_helper()
File "/home/damien/gfx/sources/intel-gpu-tools/tools/quick_dump/chipset.py", line 24, in swig_import_helper
_mod = imp.load_module('_chipset', fp, pathname, description)
File "/usr/lib64/python3.3/imp.py", line 183, in load_module
return load_dynamic(name, filename, file)
ImportError: /home/damien/gfx/sources/intel-gpu-tools/tools/quick_dump/_chipset.so: undefined symbol: kmstest_pipe_name
So, let's simplify maintainance and just link against the library we're
building and using elsewhere.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'tools/quick_dump')
| -rw-r--r-- | tools/quick_dump/Makefile.am | 17 | ||||
| -rw-r--r-- | tools/quick_dump/chipset_macro_wrap.c | 12 |
2 files changed, 8 insertions, 21 deletions
diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am index 89ac5202..b183af5c 100644 --- a/tools/quick_dump/Makefile.am +++ b/tools/quick_dump/Makefile.am @@ -6,15 +6,14 @@ dist_bin_SCRIPTS = quick_dump.py reg_access.py bin_SCRIPTS = chipset.py lib_LTLIBRARIES = I915ChipsetPython.la -I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) $(PCIACCESS_LIBS) -I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c \ - $(top_srcdir)/lib/igt_core.c \ - $(top_srcdir)/lib/igt_debugfs.c \ - $(top_srcdir)/lib/intel_os.c \ - $(top_srcdir)/lib/intel_chipset.c \ - $(top_srcdir)/lib/intel_reg_map.c \ - $(top_srcdir)/lib/intel_mmio.c \ - $(top_srcdir)/lib/intel_iosf.c +I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) +I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c +I915ChipsetPython_la_LIBADD = \ + $(top_builddir)/lib/libintel_tools.la \ + $(PCIACCESS_LIBS) \ + $(DRM_LIBS) \ + $(CAIRO_LIBS) \ + $(NULL) chipset_wrap_python.c chipset.py: chipset.i $(AM_V_GEN)$(SWIG) $(AX_SWIG_PYTHON_OPT) -I/usr/include -I$(top_srcdir)/lib -o $@ $< diff --git a/tools/quick_dump/chipset_macro_wrap.c b/tools/quick_dump/chipset_macro_wrap.c index 8bba9f71..862281e2 100644 --- a/tools/quick_dump/chipset_macro_wrap.c +++ b/tools/quick_dump/chipset_macro_wrap.c @@ -38,15 +38,3 @@ unsigned short pcidev_to_devid(struct pci_device *pdev) { return pdev->device_id; } - -bool igt_check_boolean_env_var(const char *env_var, bool default_value) -{ - char *val; - - val = getenv(env_var); - if (!val) - return default_value; - - return atoi(val) != 0; -} - |