1 files changed, 25 insertions, 15 deletions

diff --git a/dist/gdb/Makefile.osx b/dist/gdb/Makefile.osx
index 737e7a6c802..9b0587fe9a7 100644
--- a/dist/gdb/Makefile.osx
+++ b/dist/gdb/Makefile.osx
@@ -21,34 +21,44 @@ clean:
 	rm -rf  ${broot}/qtcreator-gdb-* ${staging}/gdb-* qtcreator-gdb-*.tar.gz
 
 makesourcedir:
-	test -e ${source} || mkdir ${source}
+	@test -e ${source} || mkdir ${source}
 
 maketargetdir:
-	test -e ${targetdir} || mkdir ${targetdir}
+	@test -e ${targetdir} || mkdir ${targetdir}
 
 makestagingdir:
-	test -e ${staging} || mkdir ${staging}
+	@test -e ${staging} || mkdir ${staging}
 
 ${source}/expat-${expatversion}.tar.gz: | makesourcedir
-	cd ${source}; curl -LOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
+	cd ${source} && \
+	echo "Downloading expat..." && \
+	curl -LsOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
 	touch ${source}/expat-${expatversion}.tar.gz
 
 ${source}/Python-${pyversion}.tgz: | makesourcedir
-	cd ${source}; curl -Of http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
+	cd ${source} && \
+	echo "Downloading python..." && \
+	curl -Osf http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
 	touch ${source}/Python-${pyversion}.tgz
 
 ${source}/gdb-${version}.tar.bz2: | makesourcedir
 	cd ${source} && \
-	curl -Of http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
-	curl -of gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
+	echo "Downloading gdb..." && \
+	curl -Osf http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
+	curl -osf gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
 	touch gdb-*.tar.bz2
 
 ${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
-	cd ${staging} && tar xvf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
+	cd ${staging} && \
+	echo "Extracting expat..." && \
+	tar xf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
 	./configure --disable-shared -prefix=/ && ${MAKE} && ${MAKE} install
 
 ${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir
-	unset PYTHONHOME && cd ${staging} && tar xvf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
+	unset PYTHONHOME && \
+	cd ${staging} && \
+	echo "Extracting python..." && \
+	tar xf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
 	./configure --prefix=${staging} && ${MAKE} && ${MAKE} install
 
 ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpython${pyversion}.a | maketargetdir
@@ -57,7 +67,8 @@ ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpyt
 
 ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/gdb-${version}.tar.bz2 && \
+	echo "Extracting gdb..." && \
+	tar xf ${source}/gdb-${version}.tar.bz2 && \
 	cd gdb-${version} && \
 	touch configure && \
 	patch -p2 < ${broot}/patches/pythonhome-${version}.patch && \
@@ -70,8 +81,7 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging
 	cd ${staging}/gdb-${version}-$* && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --target=$* --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	mv gdb/gdb ${targetdir}/gdb-$*
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
 	test -e ${staging}/gdb-${version}-${arch} || mkdir ${staging}/gdb-${version}-${arch}
@@ -80,10 +90,10 @@ ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${
 	cd ${staging}/gdb-${version}-${arch} && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	mv gdb/gdb ${targetdir}/gdb
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 package: ${gdbtargets} ${targetdir}/gdb ${targetdir}/python/include/python${pyversion}/pyconfig.h
 	mv ${targetdir} ${targetdir}-${arch}
-	tar cvzf ${packagename} qtcreator-gdb-${version}-${arch}
+	echo "Packing..."
+	tar czf ${packagename} qtcreator-gdb-${version}-${arch}
 	mv ${targetdir}-${arch} ${targetdir}