Date: Fri, 21 Aug 2015 12:30:04 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394949 - head/Mk Message-ID: <201508211230.t7LCU41j050496@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Aug 21 12:30:03 2015 New Revision: 394949 URL: https://svnweb.freebsd.org/changeset/ports/394949 Log: gecko: properly check OSVERSION against OPSYS [1] Bundled jemalloc is left enabled for DragonFly due to lack of documented evidence it doesn't work: failed build log, crash fingerprint, upstream bug, etc. jemalloc upstream unlike its Mozilla fork (not used here) has better support for BSDs. Requested by: marino [1] Modified: head/Mk/bsd.gecko.mk Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Fri Aug 21 12:26:22 2015 (r394948) +++ head/Mk/bsd.gecko.mk Fri Aug 21 12:30:03 2015 (r394949) @@ -130,12 +130,12 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath # use jemalloc 3.0.0 API for stats/tuning MOZ_EXPORT+= MOZ_JEMALLOC3=1 -.if ${OSVERSION} >= 1100079 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100079 . if ${MOZILLA_VER:R:R} < 43 # system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bug1125514 . endif -.elif ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37 +.elif ${OPSYS} != FreeBSD || ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37 MOZ_OPTIONS+= --enable-jemalloc .endif @@ -381,7 +381,7 @@ MOZ_OPTIONS+= --disable-debug --enable-r .if ${PORT_OPTIONS:MDTRACE} MOZ_OPTIONS+= --enable-dtrace -. if ${OSVERSION} < 1100061 +. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100061 LIBS+= -lelf . endif STRIP= @@ -454,8 +454,8 @@ MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin LDFLAGS+= -B${LOCALBASE}/bin -. if ${OSVERSION} < 1000041 && exists(/usr/lib/libcxxrt.so) && \ - ${CXXFLAGS:M-stdlib=libc++} +. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000041 && \ + exists(/usr/lib/libcxxrt.so) && ${CXXFLAGS:M-stdlib=libc++} LIBS+= -lcxxrt . endif . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508211230.t7LCU41j050496>