Dist/GDB: Upgrade expat to 2.1.1 also on linux/osx

Expat 2.2.0 fails to build on MinGW, so for now we
won't use it.

Change-Id: I1b3ffda62e1a6edfb3aa224bc9943a1806d52335
Reviewed-by: hjk <hjk@qt.io>

dist/gdb/Makefile.linux

@@ -3,7 +3,7 @@ source=${broot}/source
 targets=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu,arm-none-linux-gnueabi
 staging=${broot}/staging
 pyversion=2.7
-expatversion=2.1.0
+expatversion=2.1.1
 arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z`
 version=7.11.1
 targetdir=${broot}/qtcreator-gdb-${version}
@@ -23,11 +23,11 @@ maketargetdir:
 makestagingdir:
 	@test -e ${staging} || mkdir ${staging}
 
-${source}/expat-${expatversion}.tar.gz: | makesourcedir
+${source}/expat-${expatversion}.tar.bz2: | makesourcedir
 	cd ${source} && \
 	echo "Downloading expat..." && \
-	wget -q http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
-	touch ${source}/expat-${expatversion}.tar.gz
+	wget -q http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.bz2 && \
+	touch ${source}/expat-${expatversion}.tar.bz2
 
 ${source}/Python-${pyversion}.tgz: | makesourcedir
 	cd ${source} && \
@@ -42,10 +42,10 @@ ${source}/gdb-${version}.tar.xz: | makesourcedir
 	wget -Oq gdb-${version}.tar.xz http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.xz && \
 	touch gdb-*.tar.xz
 
-${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
+${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.bz2 | makestagingdir
 	cd ${staging} && \
 	echo "Extracting expat..." && \
-	tar xf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
+	tar xf ${source}/expat-${expatversion}.tar.bz2 && cd expat-${expatversion} && \
 	./configure --disable-shared -prefix=${staging} && ${MAKE} && ${MAKE} install
 
 ${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir

dist/gdb/Makefile.osx

@@ -3,7 +3,7 @@ source=${broot}/source
 targets=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu,arm-none-linux-gnueabi,x86_64-apple-darwin10
 staging=${broot}/staging
 pyversion=2.7
-expatversion=2.1.0
+expatversion=2.1.1
 arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z`
 version=7.11.1
 targetdir=${broot}/qtcreator-gdb-${version}
@@ -23,11 +23,11 @@ maketargetdir:
 makestagingdir:
 	@test -e ${staging} || mkdir ${staging}
 
-${source}/expat-${expatversion}.tar.gz: | makesourcedir
+${source}/expat-${expatversion}.tar.bz2: | makesourcedir
 	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
+	curl -LsOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.bz2 && \
+	touch ${source}/expat-${expatversion}.tar.bz2
 
 ${source}/Python-${pyversion}.tgz: | makesourcedir
 	cd ${source} && \
@@ -42,10 +42,10 @@ ${source}/gdb-${version}.tar.xz: | makesourcedir
 	curl -osf gdb-${version}.tar.xz http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.xz && \
 	touch gdb-*.tar.xz
 
-${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
+${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.bz2 | makestagingdir
 	cd ${staging} && \
 	echo "Extracting expat..." && \
-	tar xf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
+	tar xf ${source}/expat-${expatversion}.tar.bz2 && cd expat-${expatversion} && \
 	./configure --disable-shared -prefix=${staging} && ${MAKE} && ${MAKE} install
 
 ${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir