From owner-svn-ports-head@freebsd.org  Fri Nov  4 00:29:01 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E94FC2E12B;
 Fri,  4 Nov 2016 00:29:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 552D2131C;
 Fri,  4 Nov 2016 00:29:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA40T0nK040606;
 Fri, 4 Nov 2016 00:29:00 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA40T0ob040605;
 Fri, 4 Nov 2016 00:29:00 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201611040029.uA40T0ob040605@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 4 Nov 2016 00:29:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r425281 - head/Mk
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Nov 2016 00:29:01 -0000

Author: jbeich
Date: Fri Nov  4 00:29:00 2016
New Revision: 425281
URL: https://svnweb.freebsd.org/changeset/ports/425281

Log:
  www/firefox: unbreak build with DEBUG=on after r425099
  
  Traceback (most recent call last):
    File "configure.py", line 94, in <module>
      sys.exit(main(sys.argv))
    File "configure.py", line 22, in main
      sandbox.run(os.path.join(os.path.dirname(__file__), 'moz.configure'))
    File "python/mozbuild/mozbuild/configure/__init__.py", line 241, in run
      self._value_for(option)
    File "python/mozbuild/mozbuild/configure/__init__.py", line 305, in _value_for
      return self._value_for_option(obj)
    File "python/mozbuild/mozbuild/util.py", line 924, in method_call
      cache[args] = self.func(instance, *args)
    File "python/mozbuild/mozbuild/configure/__init__.py", line 370, in _value_for_option
      % (e.arg, reason, e.old_arg, e.old_origin))
  mozbuild.configure.options.InvalidOptionError: '--enable-debug-symbols' implied by '--enable-debug' conflicts with '--disable-debug-symbols' from the mozconfig
  *** Fix above errors and then restart with\
                 "gmake -f client.mk build"
  
  MFH:		2016Q4 (blanket)

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Fri Nov  4 00:09:51 2016	(r425280)
+++ head/Mk/bsd.gecko.mk	Fri Nov  4 00:29:00 2016	(r425281)
@@ -266,8 +266,7 @@ MOZ_OPTIONS+=	--enable-necko-protocols=$
 .endif
 # others
 MOZ_OPTIONS+=	--with-system-zlib		\
-		--with-system-bz2		\
-		--disable-debug-symbols
+		--with-system-bz2
 
 # API keys from www/chromium 
 # http://www.chromium.org/developers/how-tos/api-keys
@@ -381,7 +380,7 @@ MOZ_OPTIONS+=	--disable-rust
 MOZ_OPTIONS+=	--enable-debug --disable-release
 STRIP=	# ports/184285
 .else
-MOZ_OPTIONS+=	--disable-debug --enable-release
+MOZ_OPTIONS+=	--disable-debug --disable-debug-symbols --enable-release
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}