[Glibc-bsd-commits] r1850 - trunk/web/patches

[Aurelien Jarno]

Author: aurel32
Date: 2007-01-08 01:59:49 +0100 (Mon, 08 Jan 2007)
New Revision: 1850

Added:
   trunk/web/patches/fakeroot.diff
Log:
Biarch support for fakeroot


Added: trunk/web/patches/fakeroot.diff
===================================================================
--- trunk/web/patches/fakeroot.diff	2007-01-08 00:02:10 UTC (rev 1849)
+++ trunk/web/patches/fakeroot.diff	2007-01-08 00:59:49 UTC (rev 1850)
@@ -0,0 +1,55 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=406022
+
+diff fakeroot-1.5.10.orig/debian/control fakeroot-1.5.10/debian/control
+--- fakeroot-1.5.10.orig/debian/control	2006-07-22 23:45:34.000000000 +0200
++++ fakeroot-1.5.10/debian/control	2007-01-06 14:44:36.000000000 +0100
+@@ -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 [kfreebsd-amd64], 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 -Nru fakeroot-1.5.10.orig/debian/rules fakeroot-1.5.10/debian/rules
+--- fakeroot-1.5.10.orig/debian/rules	2006-07-23 00:32:18.000000000 +0200
++++ fakeroot-1.5.10/debian/rules	2007-01-06 14:48:23.000000000 +0100
+@@ -26,7 +26,7 @@
+ 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 @@
+ 	-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 @@
+ 	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 @@
+ 	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