[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 9499eb84a7f74b6b696b7e0401cb02d48f095baf
Author: Clint Adams <schizo at debian.org>
Date:   Mon Jan 8 00:39:17 2007 +0000

    Patch for biarch support for kfreebsd-amd64 from Aurélien Jarno.  closes: #406022.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-105

diff --git a/debian/changelog b/debian/changelog
index c497508..edae68b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.5.11) unstable; urgency=low
+
+  * Patch for biarch support for kfreebsd-amd64 from Aurélien Jarno.
+    closes: #406022.
+
+ -- Clint Adams <schizo at debian.org>  Sun,  7 Jan 2007 19:37:48 -0500
+
 fakeroot (1.5.10) unstable; urgency=low
 
   * Move po4a stuff to dist-hook and prebuild.
diff --git a/debian/control b/debian/control
index a02af08..481b163 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: fakeroot
 Section: utils
 Priority: optional
-Build-Depends: sharutils, libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], libc6-dev-i386 [amd64], libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-powerpc [ppc64], lib64gcc1 [i386]
+Build-Depends: sharutils, libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], libc6-dev-i386 [amd64], libc0.1-dev-i386 [i386], libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-powerpc [ppc64], lib64gcc1 [i386]
 Maintainer: Clint Adams <schizo at debian.org>
 Standards-Version: 3.7.2
 
diff --git a/debian/rules b/debian/rules
index ebc9bd4..e68eb20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ endif
 ifeq (x86_64-linux-gnu,$(DEB_HOST_GNU_TYPE))
 BIARCH_LIB_DIR=emul/ia32-linux/usr/lib
 else
-ifeq (ppc64-linux-gnu,$(DEB_HOST_GNU_TYPE))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), ppc64-linux-gnu x86_64-kfreebsd-gnu))
 BIARCH_LIB_DIR=usr/lib32
 else
 BIARCH_LIB_DIR=usr/lib64
@@ -71,7 +71,7 @@ clean: checkroot
 	-cd obj-tcp && $(MAKE) distclean
 	-cd objfake-sysv && $(MAKE) distclean
 	-cd objfake-tcp && $(MAKE) distclean
-ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu x86_64-linux-gnu i486-linux-gnu powerpc-linux-gnu ppc64-linux-gnu))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu x86_64-linux-gnu i486-linux-gnu powerpc-linux-gnu ppc64-linux-gnu x86_64-kfreebsd-gnu))
 	-cd obj64-sysv && $(MAKE) distclean
 	-cd obj64-tcp && $(MAKE) distclean
 endif
@@ -119,7 +119,7 @@ binary-arch: build checkroot
 	rm -f debian/tmp/usr/lib/libfakeroot/libfakeroot.*a*
 	rm -f debian/tmp/usr/bin/simple debian/tmp/usr/lib/libfakeroot.la
 	rm debian/tmp/usr/lib/libfakeroot.a
-ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu x86_64-linux-gnu i486-linux-gnu powerpc-linux-gnu ppc64-linux-gnu))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu x86_64-linux-gnu i486-linux-gnu powerpc-linux-gnu ppc64-linux-gnui x86_64-kfreebsd-gnu))
 	debian/rules binary-biarch
 endif
 	$(INSTALL_FILE) debian/copyright debian/tmp/usr/share/doc/fakeroot/copyright
@@ -202,6 +202,10 @@ ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),ppc64-linux-gnu))
 	cd obj64-sysv && CC="gcc -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=ppc64-linux --host=powerpc-linux-gnu --program-suffix=-sysv $(CONFARGS)
 	cd obj64-tcp && CC="gcc -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=ppc64-linux --host=powerpc-linux-gnu --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
 endif
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),x86_64-kfreebsd-gnu))
+	cd obj64-sysv && CC="gcc -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=x86_64-kfreebsd --host=i486-kfreebsd-gnu --program-suffix=-sysv $(CONFARGS)
+	cd obj64-tcp && CC="gcc -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=x86_64-kfreebsd --host=i486-kfreebsd-gnu --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
+endif
 
 	cd obj64-tcp && $(MAKE) libfakeroot.la
 	$(INSTALL_DIR) debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot

-- 
fakeroot