svn commit: r394871 - in head: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey...

[John Marino]

On 8/20/2015 3:16 PM, Jan Beich wrote:
> Author: jbeich
> Date: Thu Aug 20 13:16:12 2015
> New Revision: 394871
> URL: https://svnweb.freebsd.org/changeset/ports/394871
> 
> Log:
>   gecko: use system jemalloc on 11.0-CURRENT again
>   
>   Requested by:	mi
> 
> 
> Modified: head/Mk/bsd.gecko.mk
> ==============================================================================
> --- head/Mk/bsd.gecko.mk	Thu Aug 20 13:15:18 2015	(r394870)
> +++ head/Mk/bsd.gecko.mk	Thu Aug 20 13:16:12 2015	(r394871)
> @@ -130,7 +130,12 @@ LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath
>  
>  # use jemalloc 3.0.0 API for stats/tuning
>  MOZ_EXPORT+=	MOZ_JEMALLOC3=1
> -.if ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
> +.if ${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
>  MOZ_OPTIONS+=	--enable-jemalloc
>  .endif
>  


By switching the comparison from < to >=, I think this just broke
DragonFly which does not support jemalloc on any version.  I would guess
the fix would be to check OPSYS before using OSVERSION.

Thanks,
John