Attachment #152405 for bug #127026

View | Details | Raw Unified | Return to bug 127026 | Differences between

and this patch

Lines 2-9 Link Here

(-)llmozlib-svn-2.orig/build-linux-llmozlib.sh (-2 / +6 lines)
2	# This script builds llmozlib itself. This should happen after	2	# This script builds llmozlib itself. This should happen after
3	# mozilla has been built and copy_products_linux.sh has been run.	3	# mozilla has been built and copy_products_linux.sh has been run.
4		4
5	CXX='g++-3.4'	5	CXX="`ls /usr/bin/g++-3* \| tail -n1`"
6	MOZARCH='i686-linux'	6	if [ ! -x "$CXX" ]; then
		7	echo "Failed to find a g++-3 version to build mozilla"
		8	exit 1
		9	fi
		10	MOZARCH="`uname -m`-linux"
7	SRCS='llembeddedbrowser.cpp llembeddedbrowserwindow.cpp llmozlib2.cpp'	11	SRCS='llembeddedbrowser.cpp llembeddedbrowserwindow.cpp llmozlib2.cpp'
8		12
9	#------------------------	13	#------------------------

Lines 6-11 Link Here

(-)llmozlib-svn-2.orig/build_mozilla/linux-checkout_patch_build.sh (+7 lines)
6	# will also be in build-mozilla.	6	# will also be in build-mozilla.
7		7
8	# check out the mozilla source	8	# check out the mozilla source
		9	cvs() {
		10	# specify a password by adding another : to CVSROOT
		11	export CVSROOT="${CVSROOT/@/:@}"
		12	export MOZ_CVS_FLAGS="-f -Q -z3"
		13	# -f: don't use ~/.cvsrc -Q: be quiet -z3:compress traffic
		14	`which cvs` -f -Q -z3 $*
		15	}
9	export CVSROOT=':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'	16	export CVSROOT=':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'
10	echo 'use the password "anonymous" if prompted'	17	echo 'use the password "anonymous" if prompted'
11	cvs login	18	cvs login

Lines 43-49 Link Here

(-)llmozlib-svn-2.orig/build_mozilla/linux-libxul-bits/mozconfig (-1 / +4 lines)
43	if /bin/true ; then	43	if /bin/true ; then
44	TARGET_CPU=$MOZ_BUILD_APP	44	TARGET_CPU=$MOZ_BUILD_APP
45		45
46	GCC_VERSION=3.4	46	# find a gcc-3 on this system
		47	# note that ls /usr/bin/gcc-3* is safe because the same command would
		48	# have failed in build_mozilla/linux-checkout_patch_build.sh already
		49	GCC_VERSION="`ls /usr/bin/gcc-3* \| tail -n1 \| sed -e 's:.*/gcc-::'`"
47		50
48	CC="gcc-$GCC_VERSION"	51	CC="gcc-$GCC_VERSION"
49	CXX="g++-$GCC_VERSION"	52	CXX="g++-$GCC_VERSION"

Return to bug 127026