[Pkg-utopia-commits] r1588 - in /packages/experimental/nss-mdns/debian: changelog control lib32nss-mdns.install libnss-mdns.docs libnss-mdns.install rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Mon Jul 2 20:15:32 UTC 2007


Author: lool
Date: Mon Jul  2 20:15:32 2007
New Revision: 1588

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1588
Log:
* Rework the build process completely to be able to build multiple flavors;
  build a "main" flavor and an addition "m32" flavor for amd64 which is
  installed in a new lib32nss-mdns package for 32-bits compatibility;
  build-depend on gcc-mutilib; initial patch proposed by Goswin von
  Brederlow; closes: #410052.

Added:
    packages/experimental/nss-mdns/debian/lib32nss-mdns.install
Modified:
    packages/experimental/nss-mdns/debian/changelog
    packages/experimental/nss-mdns/debian/control
    packages/experimental/nss-mdns/debian/libnss-mdns.docs
    packages/experimental/nss-mdns/debian/libnss-mdns.install
    packages/experimental/nss-mdns/debian/rules

Modified: packages/experimental/nss-mdns/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/nss-mdns/debian/changelog?rev=1588&op=diff
==============================================================================
--- packages/experimental/nss-mdns/debian/changelog (original)
+++ packages/experimental/nss-mdns/debian/changelog Mon Jul  2 20:15:32 2007
@@ -1,3 +1,13 @@
+nss-mdns (0.10-2) experimental; urgency=low
+
+  * Rework the build process completely to be able to build multiple flavors;
+    build a "main" flavor and an addition "m32" flavor for amd64 which is
+    installed in a new lib32nss-mdns package for 32-bits compatibility;
+    build-depend on gcc-mutilib; initial patch proposed by Goswin von
+    Brederlow; closes: #410052.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 02 Jul 2007 21:42:31 +0200
+
 nss-mdns (0.10-1) unstable; urgency=low
 
   * Set Utopia Maintenance Team as Maintainer and add Sjoerd and myself as

Modified: packages/experimental/nss-mdns/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/nss-mdns/debian/control?rev=1588&op=diff
==============================================================================
--- packages/experimental/nss-mdns/debian/control (original)
+++ packages/experimental/nss-mdns/debian/control Mon Jul  2 20:15:32 2007
@@ -5,7 +5,8 @@
 Uploaders: Loic Minier <lool at dooz.org>,
            Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
-               lynx
+               lynx,
+               gcc-multilib [amd64]
 Standards-Version: 3.7.2
 
 Package: libnss-mdns
@@ -23,3 +24,21 @@
  DNS (using Zeroconf, aka Apple Bonjour / Apple Rendezvous ), effectively
  allowing name resolution by common Unix/Linux programs in the ad-hoc mDNS
  domain .local.
+
+Package: lib32nss-mdns
+Section: admin
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         base-files (>= 3.1.10),
+         perl,
+         avahi-daemon (>= 0.6.16-1)
+Suggests: avahi-autoipd | zeroconf
+Architecture: amd64
+Description: NSS module for Multicast DNS name resolution (32-bits version)
+ 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.
+ .
+ This package is built for 32-bits environments.

Added: packages/experimental/nss-mdns/debian/lib32nss-mdns.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/nss-mdns/debian/lib32nss-mdns.install?rev=1588&op=file
==============================================================================
--- packages/experimental/nss-mdns/debian/lib32nss-mdns.install (added)
+++ packages/experimental/nss-mdns/debian/lib32nss-mdns.install Mon Jul  2 20:15:32 2007
@@ -1,0 +1,2 @@
+# from the m32 flavor
+debian/install/m32/lib/*.so emul/ia32-linux/lib

Modified: packages/experimental/nss-mdns/debian/libnss-mdns.docs
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/nss-mdns/debian/libnss-mdns.docs?rev=1588&op=diff
==============================================================================
--- packages/experimental/nss-mdns/debian/libnss-mdns.docs (original)
+++ packages/experimental/nss-mdns/debian/libnss-mdns.docs Mon Jul  2 20:15:32 2007
@@ -1,2 +1,2 @@
 doc/style.css
-doc/README.html
+debian/build/main/doc/README.html

Modified: packages/experimental/nss-mdns/debian/libnss-mdns.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/nss-mdns/debian/libnss-mdns.install?rev=1588&op=diff
==============================================================================
--- packages/experimental/nss-mdns/debian/libnss-mdns.install (original)
+++ packages/experimental/nss-mdns/debian/libnss-mdns.install Mon Jul  2 20:15:32 2007
@@ -1,1 +1,2 @@
-lib/*.so.*
+# from the main flavor
+debian/install/main/lib/*.so.* lib

Modified: packages/experimental/nss-mdns/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/nss-mdns/debian/rules?rev=1588&op=diff
==============================================================================
--- packages/experimental/nss-mdns/debian/rules (original)
+++ packages/experimental/nss-mdns/debian/rules Mon Jul  2 20:15:32 2007
@@ -1,11 +1,31 @@
 #!/usr/bin/make -f
 
+STAMP_DIR := debian/stampdir
+
+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)
 
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+# list of flavors we build; each gets a builddir, a configure pass (configure
+# args are defined below), a build pass, and an install pass (in two steps)
+# Note: the main flavor is required
+FLAVORS := main
 
-LDFLAGS += -Wl,-z,defs
+# 32-bits flavor for 32-bits programs such as Sun's Java; see #410052
+ifeq (amd64,$(DEB_HOST_ARCH))
+FLAVORS += m32
+endif
+
+# build dir for the current flavor; this is only expanded in flavor specific
+# targets
+# Note: dh_clean will rm -rf debian/tmp, hence all builds
+builddir = $(buildbasedir)/$*
+buildbasedir = $(CURDIR)/debian/build
+
+# install dir for the current flavor; this is only expanded in flavor specific
+# targets
+installdir = $(installbasedir)/$*
+installbasedir = $(CURDIR)/debian/install
 
 configure_flags += \
 		--prefix=/ \
@@ -16,57 +36,69 @@
 		--libexecdir=/lib/nss-mdns \
 		--disable-legacy \
 		--build=$(DEB_BUILD_GNU_TYPE)
-
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-config.status: configure
+common_cflags := -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+main_cflags := $(common_cflags)
+m32_cflags := $(common_cflags) -m32
+
+LDFLAGS += -Wl,-z,defs
+
+$(STAMP_DIR)/configure-stamp-%:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	    ./configure $(configure_flags)
+	mkdir -p $(builddir)
+	cd $(builddir) && \
+		CFLAGS="$($*_cflags)" LDFLAGS="$(LDFLAGS)" \
+			$(CURDIR)/configure $(configure_flags)
+	-mkdir -p $(STAMP_DIR)
+	touch $@
 
-build: build-stamp
+configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS))
 
-build-stamp: config.status
+$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
 	dh_testdir
-	$(MAKE)
-	#docbook-to-man debian/nss-mdns.sgml > nss-mdns.1
+	$(MAKE) -C $(builddir)
 	touch $@
+
+build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+
+$(STAMP_DIR)/install-stamp-%: $(STAMP_DIR)/build-stamp-%
+	mkdir -p $(installdir)
+	$(MAKE) -C $(builddir) install DESTDIR=$(installdir)
+	touch $@
+
+install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS))
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+	# remove install and build dirs
+	rm -rf $(installbasedir)
+	rm -rf $(buildbasedir)
+	-rm -rf $(STAMP_DIR)
 	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_install -a --sourcedir=debian/tmp
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_install -s
+	dh_installman -s
+	dh_link -s
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: configure build install clean binary-indep binary-arch binary




More information about the Pkg-utopia-commits mailing list