Bug 21328: Updating to clang 3.8.0 (b9ee73ab) · Commits · Legacy / gitolite / user / gk / tor-browser-bundle

gitian/descriptors/mac/gitian-bundle.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	name: "bundle-mac"		name: "bundle-mac"
	distro: "debian"		distro: "debian"
	suites:		suites:
	- "wheezy"		- "jessie"
	architectures:		architectures:
	- "amd64"		- "amd64"
	packages:		packages:

gitian/descriptors/mac/gitian-firefox.yml

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	name: "torbrowser-mac"		name: "torbrowser-mac"
	distro: "debian"		distro: "debian"
	suites:		suites:
	- "wheezy"		- "jessie"
	architectures:		architectures:
	- "amd64"		- "amd64"
	packages:		packages:
	@@ -16,7 +16,7 @@ remotes:
	- "url": "https://git.torproject.org/tor-browser.git"		- "url": "https://git.torproject.org/tor-browser.git"
	"dir": "tor-browser"		"dir": "tor-browser"
	files:		files:
	- "clang-linux64-wheezy-utils.zip"		- "clang-linux64-jessie-utils.zip"
	- "cctools.tar.gz"		- "cctools.tar.gz"
	- "MacOSX10.7.sdk.tar.gz"		- "MacOSX10.7.sdk.tar.gz"
	- "get-moz-build-date"		- "get-moz-build-date"
	@@ -39,7 +39,7 @@ script: \|
	# Extracting all the necessary tools		# Extracting all the necessary tools
	tar xaf ../MacOSX10.7.sdk.tar.gz		tar xaf ../MacOSX10.7.sdk.tar.gz
	tar xaf ../cctools.tar.gz		tar xaf ../cctools.tar.gz
	unzip ../clang-linux64-wheezy-utils.zip		unzip ../clang-linux64-jessie-utils.zip
	# Bug 20439: build with PIE		# Bug 20439: build with PIE
	# If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi		# If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi
	# with libtool giving an error:		# with libtool giving an error:
	@@ -96,7 +96,6 @@ script: \|
	~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST		~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST
	rm -f tmp.plist		rm -f tmp.plist
	~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja		~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja
	~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja
	~/build/re-dzip.sh TorBrowser.app/Contents/Resources/browser/omni.ja		~/build/re-dzip.sh TorBrowser.app/Contents/Resources/browser/omni.ja
	cd TorBrowser.app/		cd TorBrowser.app/
	~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents		~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents

gitian/descriptors/mac/gitian-pluggable-transports.yml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	name: "pluggable-transports-mac"		name: "pluggable-transports-mac"
	distro: "debian"		distro: "debian"
	suites:		suites:
	- "wheezy"		- "jessie"
	architectures:		architectures:
	- "amd64"		- "amd64"
	packages:		packages:
	@@ -28,7 +28,7 @@ files:
	- "versions"		- "versions"
	- "go14.tar.gz"		- "go14.tar.gz"
	- "go.tar.gz"		- "go.tar.gz"
	- "clang-linux64-wheezy-utils.zip"		- "clang-linux64-jessie-utils.zip"
	- "cctools.tar.gz"		- "cctools.tar.gz"
	- "MacOSX10.7.sdk.tar.gz"		- "MacOSX10.7.sdk.tar.gz"
	- "dzip.sh"		- "dzip.sh"
	@@ -54,7 +54,7 @@ script: \|
	mkdir -p $OUTDIR/		mkdir -p $OUTDIR/
	#		#
	tar xaf cctools.tar.gz		tar xaf cctools.tar.gz
	unzip clang-linux64-wheezy-utils.zip		unzip clang-linux64-jessie-utils.zip
	# The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6		# The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6
	tar xaf MacOSX10.7.sdk.tar.gz		tar xaf MacOSX10.7.sdk.tar.gz
	# Preparing clang for cross-compilation, setting the proper flags and		# Preparing clang for cross-compilation, setting the proper flags and

gitian/descriptors/mac/gitian-tor.yml

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	name: "tor-mac"		name: "tor-mac"
	distro: "debian"		distro: "debian"
	suites:		suites:
	- "wheezy"		- "jessie"
	architectures:		architectures:
	- "amd64"		- "amd64"
	packages:		packages:
	@@ -15,7 +15,7 @@ remotes:
	- "url": "https://git.torproject.org/tor.git"		- "url": "https://git.torproject.org/tor.git"
	"dir": "tor"		"dir": "tor"
	files:		files:
	- "clang-linux64-wheezy-utils.zip"		- "clang-linux64-jessie-utils.zip"
	- "cctools.tar.gz"		- "cctools.tar.gz"
	- "MacOSX10.7.sdk.tar.gz"		- "MacOSX10.7.sdk.tar.gz"
	- "versions"		- "versions"
	@@ -46,7 +46,7 @@ script: \|
	# Extracting and copying all the necessary utilities and libraries.		# Extracting and copying all the necessary utilities and libraries.
	tar xaf MacOSX10.7.sdk.tar.gz		tar xaf MacOSX10.7.sdk.tar.gz
	tar xaf cctools.tar.gz		tar xaf cctools.tar.gz
	unzip clang-linux64-wheezy-utils.zip		unzip clang-linux64-jessie-utils.zip
	unzip -d $INSTDIR openssl-mac64-utils.zip		unzip -d $INSTDIR openssl-mac64-utils.zip
	unzip -d $INSTDIR libevent-mac64-utils.zip		unzip -d $INSTDIR libevent-mac64-utils.zip
	cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/		cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/
	@@ -70,7 +70,7 @@ script: \|
	./autogen.sh		./autogen.sh
	find -type f -print0 \| xargs -0 touch --date="$REFERENCE_DATETIME"		find -type f -print0 \| xargs -0 touch --date="$REFERENCE_DATETIME"
	./configure --enable-static-openssl --disable-asciidoc --host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR		./configure --enable-static-openssl --disable-asciidoc --host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR
	export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1		export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
	make $MAKEOPTS		make $MAKEOPTS
	make install		make install
	cd $INSTDIR		cd $INSTDIR

gitian/descriptors/mac/gitian-utils.yml

+18 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2,11 +2,10 @@
	name: "utils-mac"		name: "utils-mac"
	distro: "debian"		distro: "debian"
	suites:		suites:
	- "wheezy"		- "jessie"
	architectures:		architectures:
	- "amd64"		- "amd64"
	packages:		packages:
	- "faketime"
	- "automake"		- "automake"
	- "libtool"		- "libtool"
	- "zip"		- "zip"
	@@ -16,14 +15,14 @@ remotes:
	"dir": "libevent"		"dir": "libevent"
	- "url": "https://github.com/wolfcw/libfaketime"		- "url": "https://github.com/wolfcw/libfaketime"
	"dir": "faketime"		"dir": "faketime"
	- "url": "https://github.com/llvm-mirror/llvm"
	"dir": "llvm"
	- "url": "https://github.com/llvm-mirror/clang"
	"dir": "clang"
	- "url": "https://cmake.org/cmake.git"		- "url": "https://cmake.org/cmake.git"
	"dir": "cmake"		"dir": "cmake"
	files:		files:
	- "MacOSX10.7.sdk.tar.gz"		- "MacOSX10.7.sdk.tar.gz"
			- "llvm.tar.xz"
			- "cfe.tar.xz"
			- "libcxx.tar.xz"
			- "libcxxabi.tar.xz"
	- "openssl.tar.gz"		- "openssl.tar.gz"
	- "cctools.tar.gz"		- "cctools.tar.gz"
	- "versions"		- "versions"
	@@ -44,8 +43,18 @@ script: \|
	export PATH=$PATH:$INSTDIR/cmake/bin		export PATH=$PATH:$INSTDIR/cmake/bin

	# Clang		# Clang
	cd ../llvm		cd ..
	mv ../clang tools/		tar xaf llvm.tar.xz
			tar xaf cfe.tar.xz
			tar xaf libcxx.tar.xz
			tar xaf libcxxabi.tar.xz
			mv cfe-* clang
			mv libcxx-* libcxx
			mv libcxxabi-* libcxxabi
			mv clang llvm-*/tools
			mv libcxx llvm-*/projects
			mv libcxxabi llvm-*/projects
			cd llvm-*
	export LLVM_HOME=`pwd`		export LLVM_HOME=`pwd`
	mkdir build		mkdir build
	cd build		cd build
	@@ -108,7 +117,7 @@ script: \|

	# Grabbing the results		# Grabbing the results
	cd $INSTDIR		cd $INSTDIR
	~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang		~/build/dzip.sh clang-$CLANG_VER-linux64-jessie-utils.zip clang
	~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl		~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl
	~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent		~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent
	cp *utils.zip $OUTDIR/		cp *utils.zip $OUTDIR/