diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 11 |
3 files changed, 21 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 179e80a..2eb864c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libxml2 (2.9.0+dfsg1-3+dyson3) unstable; urgency=low + + * Use -Wl,--default-symver on illumos per libraries + linked via sunld and expecting <foo>@libxml2.so.2 + for unversioned symbols + * Build depends on lib32z1-dev [illumos-any] + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 10 Nov 2012 00:43:17 +0000 + libxml2 (2.9.0+dfsg1-3+dyson2) unstable; urgency=low * Remove -V option from dh_shlibdeps: diff --git a/debian/control b/debian/control index 765172d..5bc5b15 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Aron Xu <aron@debian.org>, YunQiang Su <wzssyqa@gmail.com> Standards-Version: 3.9.4 Build-Depends: debhelper (>= 9), perl, dh-autoreconf, autotools-dev, binutils (>= 2.14.90.0.7), python-all-dev (>= 2.6.6-3~), python-all-dbg, - gcc-multilib, lib32z1, + gcc-multilib, lib32z1-dev [illumos-any], zlib1g-dev | libz-dev, liblzma-dev, libreadline-dev | libreadline6-dev Homepage: http://xmlsoft.org/ Vcs-Git: git://git.debian.org/debian-xml-sgml/libxml2.git diff --git a/debian/rules b/debian/rules index 66612bb..7cf0966 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,17 @@ ifeq (illumos-amd64,$(DEB_HOST_ARCH)) TARGETS += 32 endif +# illumos libraries are linked via sunld which forces "base version" +# for every unversioned symbol (GNU ld option --default-imported-symver). +# GNU ld doesn't do it by default, this results in undefined symbols +# in libraries using libxml2 (libpool, libbrand and others) e. g.: +# debian/tmp/usr/lib/x86_64-illumos//libpool.so: undefined reference to +# `__xmlLoadExtDtdDefaultValue@libxml2.so.2'. This option forces GNU ld create +# and use a default symbol version (the soname) for unversioned exported symbols. +ifeq (illumos,$(DEB_HOST_ARCH_OS)) +LDFLAGS += -Wl,--default-symver +endif + WITH_UDEB := $(shell dpkg-vendor --derives-from Ubuntu && echo yes) ifdef WITH_UDEB |