# HG changeset patch
# User Jan Nieuwenhuizen <janneke@gnu.org>
# Date 1248889971 -7200
# Node ID 1a2d6ad5a556a15d87de5a26b54404a0ab757544
# Parent  f99d163249ade5ae70d119232111a54a22a40240
Switch to fakeroot-ng.

diff -r f99d163249ad -r 1a2d6ad5a556 GNUmakefile
--- a/GNUmakefile	Wed Jul 29 11:41:44 2009 +0200
+++ b/GNUmakefile	Wed Jul 29 19:52:51 2009 +0200
@@ -83,8 +83,10 @@
 
 ROOT = GUB
 FAKEROOT_CACHE = $(ROOT)/fakeroot.save
-FAKEROOT = $(ROOT)/usr/bin/fakeroot -i $(FAKEROOT_CACHE) -s $(FAKEROOT_CACHE)
-FAKECHROOT = $(ROOT)/usr/bin/fakechroot chroot $(ROOT)
+#FAKEROOT = $(ROOT)/usr/bin/fakeroot -i $(FAKEROOT_CACHE) -s $(FAKEROOT_CACHE)
+#FAKECHROOT = $(ROOT)/usr/bin/fakechroot chroot $(ROOT)
+FAKEROOT = $(ROOT)/usr/bin/fakeroot-ng -p $(FAKEROOT_CACHE)
+FAKECHROOT = chroot $(ROOT)
 BUILD_ARCHITECTURE = $(shell $(PYTHON) bin/build-architecture)
 UNTAR = cd $(ROOT)/$(BUILD_ARCHITECTURE) && set -x && for i in $$(find packages -name "*.gup"); do tar xzf $$i; done
 
@@ -112,8 +114,7 @@
  findutils\
  libtool\
  util-linux\
- fakeroot\
- fakechroot\
+ fakeroot-ng\
  expat\
  zlib\
  gzip\
@@ -144,8 +145,7 @@
  expat\
  gdbm\
  gub-utils\
- fakechroot\
- fakeroot\
+ fakeroot-ng\
  glibc-core\
  gzip\
  make\
@@ -172,6 +172,7 @@
 root:
 	$(MAKE) setup-root
 	BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub cross/gcc'
+#	BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub -x fakeroot-ng'
 
 setup-root:
 	mkdir -p $(ROOT)
@@ -192,7 +193,7 @@
 
 # run test build in root
 run:
-	BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub cross/gcc'
+	BOOTSTRAP=TRUE $(FAKEROOT) $(FAKECHROOT) bash -l -c 'gbin/gub cross/gcc'
 
 # run test build in root
 rebuildrun: setup-root
diff -r f99d163249ad -r 1a2d6ad5a556 gub/settings.py
--- a/gub/settings.py	Wed Jul 29 11:41:44 2009 +0200
+++ b/gub/settings.py	Wed Jul 29 19:52:51 2009 +0200
@@ -341,7 +341,7 @@
                 'DISPLAY', # Ugh, mingw::openoffice install complains about this...
                 # 'EMAIL',
 
-                # How to ever be clean, with this?  Hmm, not needed?
+                # How to ever be clean, with this?  Try fakeroot-ng?
                 # 'FAKECHROOT',
                 # 'FAKECHROOT_BASE',
                 # 'FAKECHROOT_VERSION',
diff -r f99d163249ad -r 1a2d6ad5a556 gub/specs/fakeroot-ng.py
--- a/gub/specs/fakeroot-ng.py	Wed Jul 29 11:41:44 2009 +0200
+++ b/gub/specs/fakeroot-ng.py	Wed Jul 29 19:52:51 2009 +0200
@@ -2,9 +2,14 @@
 
 class Fakeroot_ng__tools (tools.AutoBuild):
     source = 'http://ftp.debian.nl/debian/pool/main/f/fakeroot-ng/fakeroot-ng_0.16.orig.tar.gz'
-    patches = ['fakeroot-ng-srcdir.patch', 'fakeroot-ng-linux-2.4.patch']
+#    source = 'http://surfnet.dl.sourceforge.net/sourceforge/fakerootng/fakeroot-ng/0.17/fakeroot-ng-0.17.tar.gz'
+    patches = [
+        'fakeroot-ng-srcdir.patch',
+        'fakeroot-ng-linux-2.4.patch'
+        ]
     def configure_command (self):
         return (tools.AutoBuild.configure_command (self)
+                + ''' LDFLAGS='-L%(system_prefix)s/lib64 -L%(system_prefix)s/lib %(rpath)s %(rpath)s64 -ldl' '''
                 + ' CFLAGS=-I%(builddir)s'
                 + ' CC=%(system_prefix)s/bin/%(toolchain_prefix)sgcc'
                 + ' CXX=%(system_prefix)s/bin/%(toolchain_prefix)sg++'