From owner-svn-ports-head@FreeBSD.ORG Tue Jul 1 12:39:10 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B79F978A; Tue, 1 Jul 2014 12:39:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8AD2F2B05; Tue, 1 Jul 2014 12:39:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61CdAMp053161; Tue, 1 Jul 2014 12:39:10 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61CdAfK053160; Tue, 1 Jul 2014 12:39:10 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407011239.s61CdAfK053160@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 1 Jul 2014 12:39:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359987 - head/lang/spidermonkey185 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2014 12:39:10 -0000 Author: bapt Date: Tue Jul 1 12:39:10 2014 New Revision: 359987 URL: http://svnweb.freebsd.org/changeset/ports/359987 QAT: https://qat.redports.org/buildarchive/r359987/ Log: Fix build with readline from ports While here use options helpers Remove useless inclusion of pre.mk/post.mk Modified: head/lang/spidermonkey185/Makefile Modified: head/lang/spidermonkey185/Makefile ============================================================================== --- head/lang/spidermonkey185/Makefile Tue Jul 1 12:38:09 2014 (r359986) +++ head/lang/spidermonkey185/Makefile Tue Jul 1 12:39:10 2014 (r359987) @@ -49,62 +49,19 @@ THREADSAFE_DESC= Enable multiple thread TRACEJIT_DESC= Enable tracing JIT support UTF8_DESC= Treat strings as UTF8 instead of ISO-8859-1 -.include - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug \ - --enable-debug-symbols -.else -CONFIGURE_ARGS+= --disable-debug -.endif - -.if ${PORT_OPTIONS:MGCZEAL} -CONFIGURE_ARGS+= --enable-gczeal -.else -CONFIGURE_ARGS+= --disable-gczeal -.endif - -.if ${PORT_OPTIONS:MJEMALLOC} -CONFIGURE_ARGS+= --enable-jemalloc -.else -CONFIGURE_ARGS+= --disable-jemalloc -.endif - -.if ${PORT_OPTIONS:MMETHODJIT} -CONFIGURE_ARGS+= --enable-methodjit -.else -CONFIGURE_ARGS+= --disable-methodjit -.endif - -.if ${PORT_OPTIONS:MOPTIMIZE} -CONFIGURE_ARGS+= --enable-optimize -.else -CONFIGURE_ARGS+= --disable-optimize -.endif - -.if ${PORT_OPTIONS:MREADLINE} -CONFIGURE_ARGS+= --enable-readline -.else -CONFIGURE_ARGS+= --disable-readline -.endif - -.if ${PORT_OPTIONS:MTHREADSAFE} -CONFIGURE_ARGS+= --enable-threadsafe -.else -CONFIGURE_ARGS+= --disable-threadsafe -.endif - -.if ${PORT_OPTIONS:MTRACEJIT} -CONFIGURE_ARGS+= --enable-tracejit -.else -CONFIGURE_ARGS+= --disable-tracejit -.endif +DEBUG_CONFIGURE_ENABLE= debug +DEBUG_CONFIGURE_ON= --enable-debug-sumbols +GCZEAL_CONFIGURE_ENABLE= gczeal +JEMALLOC_CONFIGURE_ENABLE= jemalloc +METHODJIT_CONFIGURE_ENABLE= methodjit +OPTIMIZE_CONFIGURE_ENABLE= optimize +READLINE_CONFIGURE_ENABLE= readline +READLINE_USES= readline +THREADSAFE_CONFIGURE_ENABLE= threadsafe +TRACEJIT_CONFIGURE_ENABLE= tracejit +UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8 -.if ${PORT_OPTIONS:MUTF8} -CFLAGS+= -DJS_C_STRINGS_ARE_UTF8 -.endif - -.include +.include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} @@ -169,4 +126,4 @@ post-install: ${LN} -sf libmozjs185.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libmozjs185.so.1.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs185.so.1.0.0 -.include +.include