[osx/ios] added tar and dpkg to darwin depends toolchain

3 files changed, 20 insertions, 19 deletions

diff --git a/tools/darwin/depends/Makefile.in b/tools/darwin/depends/Makefile.in
index 744e2024b5..34eded8b8a 100644
--- a/tools/darwin/depends/Makefile.in
+++ b/tools/darwin/depends/Makefile.in
@@ -1,6 +1,6 @@
 include Makefile.include
 
-BUILDTOOLS = gas-preprocessor help2man autoconf automake libtool pkg-config yasm cmake
+BUILDTOOLS = gas-preprocessor help2man autoconf automake libtool pkg-config yasm cmake tar dpkg
 
 SUBDIRS := \
 	Backrow pcre expat gettext readline sqlite3 \
diff --git a/tools/darwin/depends/dpkg/Makefile b/tools/darwin/depends/dpkg/Makefile
index a9a77ad64f..355534b965 100644
--- a/tools/darwin/depends/dpkg/Makefile
+++ b/tools/darwin/depends/dpkg/Makefile
@@ -8,13 +8,13 @@ SOURCE_DEBIAN=$(APPNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
 export LIBTOOL=builds/unix/libtool
-export PATH:=$(PREFIX)/bin:$(PATH)
-CONFIGURE=./configure --prefix=$(PREFIX) \
+export PATH:=$(TOOLCHAIN)/bin:$(PATH)
+CONFIGURE=./configure --prefix=$(TOOLCHAIN) \
   --enable-static --disable-shared
 
-CLEAN_FILES=$(ARCHIVE) $(SOURCE_DEBIAN)
+APPBIN=$(TOOLCHAIN)/bin/dpkg-deb
 
-all: $(APPNAME) .installed
+all: $(APPBIN)
 
 $(TARBALLS_LOCATION)/$(ARCHIVE):
 	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
@@ -31,14 +31,13 @@ $(APPNAME): $(SOURCE_DEBIAN)
 	make -C $(SOURCE_DEBIAN)/src CFLAGS="" LDFLAGS=""
 	make -C $(SOURCE_DEBIAN)/dpkg-deb CFLAGS="" LDFLAGS=""
 
-.installed:
+$(APPBIN):
+	make $(APPNAME)
 	make -C $(SOURCE_DEBIAN)/dpkg-deb install
-	touch $@
 
 clean:
 	make -C $(SOURCE_DEBIAN) clean
-	rm -f .installed
 
 distclean::
-	rm -rf $(SOURCE_DEBIAN) .installed
+	rm -rf $(SOURCE_DEBIAN)
 
diff --git a/tools/darwin/depends/tar/Makefile b/tools/darwin/depends/tar/Makefile
index a5bbe13d80..3172bbda26 100644
--- a/tools/darwin/depends/tar/Makefile
+++ b/tools/darwin/depends/tar/Makefile
@@ -7,11 +7,14 @@ SOURCE=$(APPNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
 export LIBTOOL=builds/unix/libtool
-export PATH:=$(PREFIX)/bin:$(PATH)
-CONFIGURE=./configure --prefix=$(PREFIX) \
+export PATH:=$(TOOLCHAIN)/bin:$(PATH)
+CONFIGURE=./configure --prefix=$(TOOLCHAIN) \
 --program-transform-name=s/tar/gtar/ --disable-dependency-tracking
 
-all: $(SOURCE)/src/tar .installed
+APP=$(SOURCE)/src/tar
+APPBIN=$(TOOLCHAIN)/bin/gtar
+
+all: $(APPBIN)
 
 $(TARBALLS_LOCATION)/$(ARCHIVE):
 	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
@@ -22,18 +25,17 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	echo $(SOURCE) > .gitignore
 	cd $(SOURCE); $(CONFIGURE)
 
-$(SOURCE)/src/tar: $(SOURCE)
-	cd $(SOURCE); make
+$(APP): $(SOURCE)
+	make -C $(SOURCE)
 
-.installed:
+$(APPBIN):
+	make $(APP)
 	make -C $(SOURCE) install
-	cd $(PREFIX)/bin; ln -s gtar tar; ln -s gtar gnutar
-	touch $@
+	cd $(TOOLCHAIN)/bin; ln -s gtar tar; ln -s gtar gnutar
 
 clean:
 	make -C $(SOURCE) clean
-	rm -f .installed
 
 distclean::
-	rm -rf $(SOURCE) .installed
+	rm -rf $(SOURCE)