[SVN-Commit] r1526 - in trunk: Mk www/seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Feb 28 21:44:38 2014
New Revision: 1526

Log:
use compiler.mk to unbreak QAT footshooting

compiler.mk brings lang/clang33 on 8.x which is affected by LLVM PR 15840.
i386 users are probably better off with FAVORITE_COMPILER=gcc in make.conf.

https://qat.redports.org/~beat@FreeBSD.org/20140216223200-30828-279020/firefox-27.0.1,1.log

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Fri Feb 28 21:44:30 2014	(r1525)
+++ trunk/Mk/bsd.gecko.mk	Fri Feb 28 21:44:38 2014	(r1526)
@@ -502,7 +502,7 @@
 MOZILLA_EXEC_NAME?=${MOZILLA}
 MOZ_RPATH?=	${MOZILLA}
 USE_GNOME+=	libidl desktopfileutils
-USES+=		gmake iconv perl5 pkgconfig
+USES+=		compiler:c++11-lang gmake iconv perl5 pkgconfig
 USE_PERL5=	build
 USE_XORG=	printproto sm xt xi xext x11 xinerama \
 		ice xproto
@@ -542,24 +542,6 @@
 CPPFLAGS+=		-isystem${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-R,${PREFIX}/lib/${MOZILLA}
 
-# prefer base clang, for lang/clang{,-devel} see ports/177224
-.if ${CC} == "cc" && (exists(/usr/bin/clang) && ${OSVERSION} >= 900014)
-CC=				/usr/bin/clang
-.endif
-.if ${CXX} == "c++" && (exists(/usr/bin/clang++) && ${OSVERSION} >= 900014)
-CXX=			/usr/bin/clang++
-.endif
-.if ${CPP} == "cpp" && (exists(/usr/bin/clang-cpp) && ${OSVERSION} >= 900045)
-CPP=			/usr/bin/clang-cpp
-.endif
-.if ${CC} != "cc" && ${CPP} == "cpp"
-CPP=			${CC} -E
-.endif
-# fallback to gcc otherwise
-.if ${CC} == "cc" || ${CXX} == "c++"
-USE_GCC?=		yes
-.endif
-
 # use jemalloc 3.0.0 API for stats/tuning
 MOZ_EXPORT+=	MOZ_JEMALLOC3=1
 .if ${OSVERSION} < 1000012

Modified: trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
==============================================================================
--- trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl	Fri Feb 28 21:44:30 2014	(r1525)
+++ trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl	Fri Feb 28 21:44:38 2014	(r1526)
@@ -41,3 +41,13 @@
    if ($targetOs eq "SunOS") {
      $targetComp = "sunc";
    }
+@@ -107,6 +109,9 @@ elsif ($srcComp =~ /cc/) {
+   elsif ($targetOs eq "AIX") {
+     $targetComp = "ibmc";
+   }
++  else {
++    $targetComp = "gcc3";
++  }
+ }
+ else {
+   $targetComp = $srcComp;