[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 01437c546555562e131518c4420134f0297aeb69
Author: Clint Adams <schizo at debian.org>
Date:   Mon Jun 21 22:59:58 2004 +0000

    Fix stupid 64-bit build thinko on s390.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-7

diff --git a/debian/changelog b/debian/changelog
index b0a80db..20dc3ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ fakeroot (1.0.3) unstable; urgency=low
   * INSTALL: add some terse notes.
   * Add prebuild target to debian/rules for use with arch-buildpackage.
   * scripts/fakeroot.in: drop "-net" from version string.
+  * Fix stupid build thinko on s390.
 
  -- Clint Adams <schizo at debian.org>  Fri, 18 Jun 2004 15:42:33 -0400
 
diff --git a/debian/rules b/debian/rules
index bf22e13..f111a95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,8 +133,14 @@ binary-biarch:
 	$(checkdir)
 	mkdir obj64 obj64-tcp
 
+ifeq (sparc-linux,$(DEB_HOST_GNU_TYPE))
 	cd obj64 && CC="gcc -m64" ../configure --prefix=/usr --mandir=/usr/share/man --build=sparc-linux --host=sparc64-linux
 	cd obj64-tcp && CC="gcc -m64" ../configure --prefix=/usr --mandir=/usr/share/man --build=sparc-linux --host=sparc64-linux --with-ipc=tcp --program-suffix=-tcp
+endif
+ifeq (s390-linux,$(DEB_HOST_GNU_TYPE))
+	cd obj64 && CC="gcc -m64" ../configure --prefix=/usr --mandir=/usr/share/man --build=sparc-linux --host=s390x-linux
+	cd obj64-tcp && CC="gcc -m64" ../configure --prefix=/usr --mandir=/usr/share/man --build=sparc-linux --host=s390x-linux --with-ipc=tcp --program-suffix=-tcp
+endif
 
 	cd obj64-tcp && $(MAKE) libfakeroot.la
 	$(INSTALL_DIR) debian/tmp/usr/lib64/libfakeroot

-- 
fakeroot