[Pkg-utopia-maintainers] Bug#404436: Patch for 32bit support for amd64

[Goswin von Brederlow]

Package: nss-mdns
Version: 0.10-0.1
Followup-For: Bug #410052

reassign 410052 nss-mdns
retitle 410052 please add lib32nss-mdns for amd64 for ia32-sun-java6-bin
thanks

Hi,

attached is a patch for nss-mdns to build a lib32nss-mdns package
which ia32-sun-java6-bin needs.  Since the package can be build
natively it is highly prefered to do so instead of adding it to the
cludge that ia32-libs is.

MfG
	Goswin

-- System Information:
Debian Release: 4.0
  APT prefers stable-security
  APT policy: (500, 'stable-security'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.20.9-xen-1
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
-------------- next part --------------
diff -u nss-mdns-0.10/debian/control nss-mdns-0.10/debian/control
--- nss-mdns-0.10/debian/control
+++ nss-mdns-0.10/debian/control
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Anand Kumria <wildfire at progsoc.org>
-Build-Depends: debhelper (>> 4.0.0), lynx
+Build-Depends: debhelper (>> 4.0.0), lynx, gcc-multilib [amd64]
 Standards-Version: 3.7.2
 
 Package: libnss-mdns
@@ -18,0 +19,12 @@
+
+Package: lib32nss-mdns
+Section: admin
+Depends: ${shlibs:Depends}, base-files (>= 3.1.10), perl, avahi-daemon (>= 0.6.16-1)
+Suggests: avahi-autoipd | zeroconf
+Architecture: amd64
+Description: 32bit NSS module for Multicast DNS name resolution
+ nss-mdns is a plugin for the GNU Name Service Switch (NSS) functionality
+ of the GNU C Library (glibc) providing host name resolution via Multicast
+ DNS (using Zeroconf, aka Apple Bonjour / Apple Rendezvous ), effectively
+ allowing name resolution by common Unix/Linux programs in the ad-hoc mDNS
+ domain .local.
diff -u nss-mdns-0.10/debian/rules nss-mdns-0.10/debian/rules
--- nss-mdns-0.10/debian/rules
+++ nss-mdns-0.10/debian/rules
@@ -12,6 +12,7 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -24,19 +25,27 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+	BUILD_TARGETS := build-native-stamp build-32-stamp
+else
+	BUILD_TARGETS := build-native-stamp
+endif
+
+build-32/config.status: CFLAGS := -m32 $(CFLAGS)
+build-%/config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/ --mandir=/usr/share/man --infodir=/usr/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib/nss-mdns CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-legacy
+	mkdir build-$*
+	cd build-$* && ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/ --mandir=/usr/share/man --infodir=/usr/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib/nss-mdns CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-legacy
 
 
-build: build-stamp
+build: $(BUILD_TARGETS)
 
-build-stamp:  config.status
+build-%-stamp:  build-%/config.status 
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE)
+	cd build-$* && $(MAKE)
 	#docbook-to-man debian/nss-mdns.sgml > nss-mdns.1
 
 	touch $@
@@ -44,11 +53,11 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-native-stamp build-32-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
+	#-$(MAKE) distclean
+	rm -rf build-native build-32
 
 	dh_clean 
 
@@ -59,8 +68,10 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/nss-mdns.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/libnss-mdns
-
+	cd build-native && $(MAKE) install DESTDIR=$(CURDIR)/debian/libnss-mdns
+ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+	cd build-32 && $(MAKE) install DESTDIR=$(CURDIR)/debian/lib32nss-mdns
+endif
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -101,0 +113 @@
+.SECONDARY: build-native/config.status build-32/config.status
\ No newline at end of file
diff -u nss-mdns-0.10/debian/docs nss-mdns-0.10/debian/docs
--- nss-mdns-0.10/debian/docs
+++ nss-mdns-0.10/debian/docs
@@ -2 +2 @@
-doc/README.html
+build-native/doc/README.html
diff -u nss-mdns-0.10/debian/changelog nss-mdns-0.10/debian/changelog
--- nss-mdns-0.10/debian/changelog
+++ nss-mdns-0.10/debian/changelog
@@ -1,3 +1,10 @@
+nss-mdns (0.10-0.2) unstable; urgency=low
+
+  * debian/control: add lib32nss-mdns and Build-Depends gcc-multilib [amd64]
+  * debian/rules: add lib32nss-mdns support
+
+ -- Goswin von Brederlow <brederlo at informatik.uni-tuebingen.de>  Mon,  2 Jul 2007 15:21:05 +0200
+
 nss-mdns (0.10-0.1) unstable; urgency=high
 
   * NMU