[Qemu-arm-eabi-devel] SF.net SVN: qemu-arm-eabi:[24] trunk/fakeroot.patch

[<bue...@us...>]

Revision: 24
          http://qemu-arm-eabi.svn.sourceforge.net/qemu-arm-eabi/?rev=24&view=rev
Author:   bueroman
Date:     2008-08-19 15:22:17 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
Changes to fakeroot patch based on caio's fix.

Modified Paths:
--------------
    trunk/fakeroot.patch

Modified: trunk/fakeroot.patch
===================================================================
--- trunk/fakeroot.patch	2008-08-19 00:11:25 UTC (rev 23)
+++ trunk/fakeroot.patch	2008-08-19 15:22:17 UTC (rev 24)
@@ -1,24 +1,15 @@
---- /scratchbox/tools/bin/fakeroot-tcp	2008-08-18 17:01:21.000000000 -0300
-+++ /scratchbox/tools/bin/fakeroot-tcp.mine	2008-08-18 17:00:42.000000000 -0300
-@@ -113,11 +113,19 @@
- export _SBOX_NONFAKE_UID=`id -u`
+--- /scratchbox/tools/bin/fakeroot-tcp.orig	2008-08-18 19:11:03.000000000 -0300
++++ /scratchbox/tools/bin/fakeroot-tcp.mine	2008-08-19 11:31:14.000000000 -0300
+@@ -114,10 +114,10 @@
  export _SBOX_NONFAKE_GID=`id -g`
  
-+# Fix qemu path separator problem between scratchbox and arm-eabi versions.
-+if [ "`sb-conf show | grep CPU-transparency | cut -c53-65`" == "qemu-arm-eabi" ]
-+then
-+  SEP=":"
-+else
-+  SEP=","
-+fi
-+
  if test -z "$*"; then
 -  FAKEROOTKEY=$FAKEROOTKEY SBOX_PRELOAD="${PREFIX}/lib/$LIB,/usr/lib/libfakeroot/$LIB" ${SHELL:-/bin/sh}
-+  FAKEROOTKEY=$FAKEROOTKEY SBOX_PRELOAD="${PREFIX}/lib/$LIB${SEP}/usr/lib/libfakeroot/$LIB" ${SHELL:-/bin/sh}
++  FAKEROOTKEY=$FAKEROOTKEY SBOX_PRELOAD="${PREFIX}/lib/$LIB" ${SHELL:-/bin/sh}
    RESULT=$?
  else
 -  FAKEROOTKEY=$FAKEROOTKEY SBOX_PRELOAD="${PREFIX}/lib/$LIB,/usr/lib/libfakeroot/$LIB" "$@"
-+  FAKEROOTKEY=$FAKEROOTKEY SBOX_PRELOAD="${PREFIX}/lib/$LIB${SEP}/usr/lib/libfakeroot/$LIB" "$@"
++  FAKEROOTKEY=$FAKEROOTKEY SBOX_PRELOAD="${PREFIX}/lib/$LIB" "$@"
    RESULT=$?
  fi
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.