From 4d867832863ecb314b9aaad45a9c940ff22885ec Mon Sep 17 00:00:00 2001
From: javacom <javacomhk@yahoo.com>
Date: Sat, 23 Apr 2011 14:04:52 +0800
Subject: [PATCH] add codesign_allocate and ldid

---
 Projects/LocalPush/Makefile  | 5 ++---
 README                       | 5 ++++-
 cctools2odcctools/extract.sh | 1 +
 toolchain.sh                 | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Projects/LocalPush/Makefile b/Projects/LocalPush/Makefile
index d3589cc..945ad51 100644
--- a/Projects/LocalPush/Makefile
+++ b/Projects/LocalPush/Makefile
@@ -98,8 +98,7 @@ PCH=$(wildcard *.pch)
 INFOPLIST=$(wildcard *Info.plist)
 
 CFLAGS += -I"$(SRCDIR1)"
-
-CPPFLAGS=$CFLAGS
+CPPLAGS += -I"$(SRCDIR1)"
 
 all:	$(PROJECTNAME)
 
@@ -125,7 +124,7 @@ ifneq ($(RESOURCES),)
 endif
 	cp $(INFOPLIST) $(BUILDDIR)/$(APPFOLDER)/Info.plist
 	@echo "APPL????" > $(BUILDDIR)/$(APPFOLDER)/PkgInfo
-	#export CODESIGN_ALLOCATE=$(toolchain)/pre/bin/arm-apple-darwin9-codesign_allocate; ldid -S $(PROJECTNAME)
+	export CODESIGN_ALLOCATE=$(toolchain)/pre/bin/arm-apple-darwin9-codesign_allocate; $(toolchain)/pre/bin/ldid -S $(PROJECTNAME)
 	mv $(PROJECTNAME) $(BUILDDIR)/$(APPFOLDER)
 	mkdir $(BUILDDIR)/Payload
 	cd $(BUILDDIR)/Payload; ln -s ../$(APPFOLDER) .
diff --git a/README b/README
index e767acc..c2a02d8 100644
--- a/README
+++ b/README
@@ -8,6 +8,8 @@ sudo apt-get install git autoconf gawk libssl-dev uuid-dev
 sudo apt-get install clang
 
 3.  Create /toolchain4
+    sudo mkdir -p /toolchain4
+    sudo chown -R <yourusername>:<yourusername> /toolchain4
 
 4.  Put iPhoneOS4.2.sdk.tgz to /toolchain4/sdks/
     
@@ -16,11 +18,12 @@ sudo apt-get install clang
     ./toolchain.sh xar
     then put iPhoneSDK4_2.pkg to /toolchain4/sdks/
 
-5.  Run
+5.  Build headers tools and gcc 
     cd /toolchain4
     ./toolchain.sh buildsys
     ./toolchain.sh cctools
     ./toolchain.sh llvmgcc
+    ./toolchain.sh ldid
 
 6.  Install as_driver
     cd /toolchain4/as_driver
diff --git a/cctools2odcctools/extract.sh b/cctools2odcctools/extract.sh
index 153b071..f540960 100755
--- a/cctools2odcctools/extract.sh
+++ b/cctools2odcctools/extract.sh
@@ -181,5 +181,6 @@ if [ $MAKEDISTFILE -eq 1 ]; then
     mv ${DISTDIR} ${DISTDIR}-$DATE
     tar jcf ${DISTDIR}-$DATE.tar.bz2 ${DISTDIR}-$DATE
 fi
+patch odcctools/misc/Makefile.in < patches/misc/Makefile.in.diff
 
 exit 0
diff --git a/toolchain.sh b/toolchain.sh
index 6a67ae0..cbdb7b4 100755
--- a/toolchain.sh
+++ b/toolchain.sh
@@ -1476,7 +1476,7 @@ case $1 in
 		fi
 		cd ldid-1.0.610
 		g++ -I . -o util/ldid{,.cpp} -x c util/{lookup2,sha1}.c
-		sudo cp -a util/ldid ${TOOLCHAIN}/pre/bin/
+		cp -a util/ldid ${TOOLCHAIN}/pre/bin/
 		message_action "ldid built."
 		;;