From owner-freebsd-gecko@FreeBSD.ORG Thu Mar 7 11:18:57 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 41099437 for ; Thu, 7 Mar 2013 11:18:57 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id DADD420C for ; Thu, 7 Mar 2013 11:18:56 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r27BItG4050557 for ; Thu, 7 Mar 2013 11:18:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r27BIo4s048593 for freebsd-gecko@freebsd.org; Thu, 7 Mar 2013 11:18:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 7 Mar 2013 11:18:50 GMT Message-Id: <201303071118.r27BIo4s048593@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1201 - in trunk: Mk mail/thunderbird mail/thunderbird-esr www/firefox www/firefox-esr www/firefox-nightly www/kompozer www/libxul www/libxul19 www/seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Mar 2013 11:18:57 -0000 Author: jbeich Date: Thu Mar 7 11:18:50 2013 New Revision: 1201 Log: move arch quirks to bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/kompozer/Makefile trunk/www/libxul/Makefile trunk/www/libxul19/Makefile trunk/www/seamonkey/Makefile Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/Mk/bsd.gecko.mk Thu Mar 7 11:18:50 2013 (r1201) @@ -820,7 +820,16 @@ -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} -.if ${ARCH}=="sparc64" +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 +. if ${OSVERSION} < 900033 +BROKEN= Needs binutils 2.17.50 to build +. else +MOZ_EXPORT+= UNAME_m="powerpc64" +CFLAGS+= -mminimal-toc +. endif +.elif ${ARCH} == "sparc64" # Work around miscompilation/mislinkage of the sCanonicalVTable hacks. MOZ_OPTIONS+= --disable-v1-string-abi .endif Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/mail/thunderbird-esr/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -63,17 +63,6 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if ${PORT_OPTIONS:MENIGMAIL} MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail DISTFILES+= ${EM_DISTFILE}:enigmail Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/mail/thunderbird/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -69,17 +69,6 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if ${PORT_OPTIONS:MENIGMAIL} MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail DISTFILES+= ${EM_DISTFILE}:enigmail Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/www/firefox-esr/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -56,17 +56,6 @@ WRKSRC:= ${WRKDIR}/mozilla-esr17 -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if ${PORT_OPTIONS:MPGO} USE_GCC?= any USE_DISPLAY= yes Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/www/firefox-nightly/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -59,17 +59,6 @@ WRKSRC:= ${WRKSRC}-central-${HGREV:C/.*://} -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if ${PORT_OPTIONS:MPGO} USE_GCC?= yes USE_DISPLAY= yes Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/www/firefox/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -57,17 +57,6 @@ WRKSRC:= ${WRKDIR}/mozilla-beta -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if ${PORT_OPTIONS:MPGO} USE_GCC?= yes USE_DISPLAY= yes Modified: trunk/www/kompozer/Makefile ============================================================================== --- trunk/www/kompozer/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/www/kompozer/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -49,10 +49,6 @@ .include -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.endif - post-patch: @${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/www/libxul/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -54,17 +54,6 @@ MOZ_PKGCONFIG_FILES+= mozilla-nss .endif -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if !empty(CXX:M*clang++*) || (${CXX:Mc++} && ${OSVERSION} > 1000023) CXXFLAGS+= -Wno-return-type-c-linkage .endif Modified: trunk/www/libxul19/Makefile ============================================================================== --- trunk/www/libxul19/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/www/libxul19/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -63,17 +63,6 @@ MOZ_PKGCONFIG_FILES+= mozilla-nss .endif -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION+= 1.5+ Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Thu Mar 7 11:18:39 2013 (r1200) +++ trunk/www/seamonkey/Makefile Thu Mar 7 11:18:50 2013 (r1201) @@ -72,17 +72,6 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi -.if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -MOZ_EXPORT+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - .if ! ${PORT_OPTIONS:MMAILNEWS} EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ ${FILESDIR}/extra-patch-configure.in