diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2007-02-27 10:42:27 +0000 |
|---|---|---|
| committer | Chris Wilson <cpwilson@src.gnome.org> | 2007-02-27 10:42:27 +0000 |
| commit | 226bb59731c29dd2e08c20f54d64db9e97d3549b (patch) | |
| tree | d281064749332adb441b03b4d327d59241ef70f0 /python | |
| parent | 854cc5c5038cdabf73e8898a5c0b25364b01a03a (diff) | |
Bug 410986 – Fails to build with -z defs
2007-02-27 Chris Wilson <chris@chris-wilson.co.uk>
Bug 410986 – Fails to build with -z defs
If you link the vtemodule.so to libpython, then programs importing
vte will have the symbols twice in memory: one set from python and
the other from libpython.
* configure.in:
* python/Makefile.am:
Remove PYTHON_LIBS from linking vtemodule.so.
Convert unresolved symbol errors into warnings so that
building with -Wl,-z,defs continues to work. This is a
*hack* as it hides real errors if you are updating
vte.{def,override}.
svn path=/trunk/; revision=1767
Diffstat (limited to 'python')
| -rw-r--r-- | python/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/python/Makefile.am b/python/Makefile.am index edad74e..c223d9c 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -8,9 +8,13 @@ pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES) CLEANFILES = vte.c +# we do this to suport building with -Wl,-z,defs which errors on +# vtemodule.so as we cannot include $(PYTHON_LIBS) due to bug 410986. +LDFLAGS += $(PYTHON_LDFLAGS) + vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) vtemodule_la_SOURCES = vtemodule.c -vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(PYTHON_LIBS) $(VTE_LIBS) $(X_LIBS) +vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS) vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte nodist_vtemodule_la_SOURCES = vte.c |