mozcoreconf-2.eclass.set-host-triple.custom-optimize.patch

mozcoreconf-2.eclass.patch (text/plain), 2.80 KB, created by cmuelle8 on 2013-04-01 21:03:35 UTC

--- mozcoreconf-2.eclass	2013-03-25 14:31:15.000000000 +0100
+++ mozcoreconf-2.eclass.new	2013-04-01 22:14:16.000000000 +0200
@@ -108,7 +108,7 @@
 }
 
 mozconfig_init() {
-	declare enable_optimize pango_version myext x
+	declare _annomsg _oflag enable_optimize pango_version myext x 
 	declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false)
 	declare FF=$([[ ${PN} == firefox ]] && echo true || echo false)
 	declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
@@ -138,37 +138,49 @@
 			mozconfig_annotate "" --enable-application=mail ;;
 	esac
 
+	# do not depend on config.guess, bug #462608 cmt #8 
+	# just use the triple from make.conf
+	mozconfig_annotate "" --host=${CHOST}
+
 	####################################
 	#
 	# CFLAGS setup and ARCH support
 	#
 	####################################
 
-	# Set optimization level
-	if [[ ${ARCH} == hppa ]]; then
-		mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0
-	elif [[ ${ARCH} == x86 ]]; then
-		mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-optimize=-O2
-	elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
-		# Set optimization level based on CFLAGS
-		if is-flag -O0; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O0
+	# Known to be broken
+	if [[ "$(tc-getCC)" == "gcc" ]]; then
+		if [[ ${ARCH} == hppa ]]; then
+			_annomsg="more than -O0 causes a segfault on hppa"
+			replace-flags "-O*" "-O0"
 		elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then
-			mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1
-		elif is-flag -O3; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O3
-		elif is-flag -O1; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O1
-		elif is-flag -Os; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-Os
+			_annomsg="more than -O1 causes a segfault on ppc with >=sys-libs/glibc-2.8"
+			replace-flags "-O[2-9]" "-O1"
+		elif [[ ${ARCH} == x86 ]]; then
+			_annomsg="less than -O2 causes a segfault on x86"
+			replace-flags "-O[0-1]" "-O2"
+		fi
+	fi
+
+	# Determine optimization level
+	if use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
+		# Set optimization level based on CFLAGS
+		if is-flag "-O*"; then
+			_annomsg="${_annomsg:-from CFLAGS}"
+			_oflag=$(get-flag "-O*")
 		else
-			mozconfig_annotate "Gentoo's default optimization" --enable-optimize=-O2
+			_annomsg="Gentoo\'s default optimization"
+			_oflag="-O2"
 		fi
 	else
 		# Enable Mozilla's default
-		mozconfig_annotate "mozilla default" --enable-optimize
+		_annomsg="mozilla default"
+		_oflag=
 	fi
 
+	# Set optimization level
+	mozconfig_annotate "$_annomsg" --enable-optimize${_oflag:+=$_oflag}
+
 	# Strip optimization so it does not end up in compile string
 	filter-flags '-O*'