Date: Sun, 23 Mar 2014 12:01:42 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348851 - head/www/seamonkey Message-ID: <201403231201.s2NC1gr1074213@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Mar 23 12:01:42 2014 New Revision: 348851 URL: http://svnweb.freebsd.org/changeset/ports/348851 QAT: https://qat.redports.org/buildarchive/r348851/ Log: www/seamonkey: Unbreak DragonFly The first fix is a NO-OP for FreeBSD. The clang/optimized flags work- around is OSVERSION-specific, so let's limit it to FreeBSD only. The real breakage was caused by the XPI_FILE substitution. The "x86" part of DragonFly's "x86_64" was getting transformed incorrectly to "i386_64". This could be prevented by changing the replacement pattern to "x86$", but "x86" is not a standard ARCH value, so this substitution isn't made on FreeBSD anyway. The solution is just remove it as the only effect it has is negative. Tested on: Redports, all four i386 builders pass Modified: head/www/seamonkey/Makefile Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Sun Mar 23 10:41:00 2014 (r348850) +++ head/www/seamonkey/Makefile Sun Mar 23 12:01:42 2014 (r348851) @@ -85,6 +85,7 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi # avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1> # http://svnweb.freebsd.org/changeset/base/255804 +.if ${OPSYS} == FreeBSD .if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056 . if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} BROKEN= Cannot build with OPTIMIZED_CFLAGS option due to \ @@ -99,6 +100,7 @@ CXXFLAGS+= -O1 . endif . endif .endif +.endif .if ${PORT_OPTIONS:MALSA} BUILD_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib @@ -138,7 +140,7 @@ MOZ_OPTIONS+= --disable-composer MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/x86/i386/:S/amd64/x86_64/}.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403231201.s2NC1gr1074213>