Build 32-bit library on illumos-amd64

2 files changed, 41 insertions, 1 deletions

diff --git a/debian/control b/debian/control
index 9ac1283..8bac17a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,40 @@ 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-multiarch, lib32z1,
  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
 Vcs-Browser: http://git.debian.org/?p=debian-xml-sgml/libxml2.git
 XS-Testsuite: autopkgtest
 
+Package: lib32xml2
+Priority: optional
+Architecture: illumos-amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GNOME XML library (32-bit)
+ XML is a metalanguage to let you design your own markup language.
+ A regular markup language defines a way to describe information in
+ a certain class of documents (eg HTML). XML lets you define your
+ own customized markup languages for many classes of document. It
+ can do this because it's written in SGML, the international standard
+ metalanguage for markup languages.
+ .
+ This package provides a library providing an extensive API to handle
+ such XML data files.
+ .
+ This is 32-bit version of the library.
+
+Package: lib32xml2-dev
+Architecture: illumos-amd64
+Section: libdevel
+Depends: lib32xml2 (= ${binary:Version}), ${misc:Depends}, libxml2-dev (= ${binary:Version})
+Description: Development files for the GNOME XML library (32-bit)
+ This package contains files needed to develop 32-bit applications
+ using the libxml2 library.
+ .
+ The libxml2 library provides an extensive API to handle XML data files.
+
 Package: libxml2
 Priority: standard
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 5087e7a..e27e68e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 # The versions of python currently supported
 PYVERS=$(shell pyversions -s)
 # The current default version of python
@@ -13,6 +15,9 @@ LDFLAGS = `dpkg-buildflags --get LDFLAGS` -Wl,--as-needed
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
 TARGETS := main $(PYVERS) $(PYVERS:%=%-dbg)
+ifeq (illumos-amd64,$(DEB_HOST_ARCH))
+TARGETS += 32
+endif
 
 WITH_UDEB := $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
 
@@ -24,7 +29,9 @@ $(if $(shell grep -q libxml2-udeb debian/control && echo yes),$(shell sed -i /li
 export DH_OPTIONS = -Nlibxml2-udeb
 endif
 
-CONFIGURE_FLAGS := --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/builddir/config.cache"
+CACHE_FILE := $(CURDIR)/builddir/config.cache
+
+CONFIGURE_FLAGS = --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CACHE_FILE)"
 
 override_dh_auto_configure: $(TARGETS:%=doconfigure-%)
 
@@ -35,6 +42,11 @@ doconfigure-main: CONFIGURE_FLAGS += --without-python
 doconfigure-python%: CONFIGURE_FLAGS += --with-python=/usr/bin/$*
 doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-minimum --with-tree --with-output
 
+# For dyson we need 32-bit library, but we don't have 32-bit liblzma
+doconfigure-32: CONFIGURE_FLAGS += --without-python --libdir=/usr/lib32 --without-lzma
+doconfigure-32: CC += -m32
+doconfigure-32: CACHE_FILE = /dev/null
+
 override_dh_auto_build: $(TARGETS:%=dobuild-%)
 
 dobuild-%: BUILD_DIR=builddir/$*