From nobody Tue Apr 26 21:14:55 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A75441996977; Tue, 26 Apr 2022 21:14:56 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Knvm04Gqwz4j4r; Tue, 26 Apr 2022 21:14:56 +0000 (UTC) (envelope-from jkim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651007696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SVBZ7vduMTu5hdqtsU7vI7yxtacwl7R7T5YGQj+T/rQ=; b=wft08lSqFKiys6VWdjUss7Knf3PMIDkfgdgP4DiCgbvRdvygnpf6Rkz7IK/11yIlwUF9yy NP/729LpK845a3kj7RY/94F8cmAYq25xgqxksNTZmSF4iBGaYRBOsMYHkvYDUbIZNcv9tS 4mp8V6JA2SA43+zsz/VcPuOdsh4cxshf595vtvQN3wv7PV4coVGOclla+djyUoBv0nZCSY Nmj0ugVMKLVgPPPz8G2LzU+UCtK3yU2s5f54AIbRjVD2LYzXGNpsNpiyL1XS3D74FWRPlt TBum980YMeWGghZkGPoTTsEmvefpxiPFUxAJCckvb6u+Je6WKpygPdtKudJMyQ== Received: from freefall.freebsd.org (pool-100-8-53-238.nwrknj.fios.verizon.net [100.8.53.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 609962A7; Tue, 26 Apr 2022 21:14:56 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Message-ID: Date: Tue, 26 Apr 2022 17:14:55 -0400 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Content-Language: en-US To: Guido Falsi , Christoph Moench-Tegeder , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202204261851.23QIpdlL055150@gitrepo.freebsd.org> <8bc69c82-b058-eedc-52a5-de2341cdef93@FreeBSD.org> From: Jung-uk Kim Organization: FreeBSD.org Subject: Re: git: 48a481f83ecb - main - www/firefox: fix build with sndio In-Reply-To: <8bc69c82-b058-eedc-52a5-de2341cdef93@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651007696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SVBZ7vduMTu5hdqtsU7vI7yxtacwl7R7T5YGQj+T/rQ=; b=jLxJppaEBigdqTSBlR9ULtJPpGNf7v7VrsmDzjc5BNAiYwFM2GTy7GxOgu3rV5SeSUiW3B 83k+6OKpMlSOXfH95DHrkdyq7y/cX/qV2SNZLyWJH1q/HZexQMFLeqdJ46p7MUOb5kXSng 0+FMoanTCYaKujCkx/qaTHCa4HfYo86tT+byLkZizR/Lrt86fQO2sNTIVMhK/30JBfCR/Q 5xOQYDiD7pKjlp/ODbp8zMRV3I0odJwlOI92Gm478OBq9a3OEXgr6rLJBTEFCODd9PJp5q g6/2gUvdQo2A1bRKNj5Szl5LuNlqB2dQ6AbQcIggeUBDg1Zz6LZL25DhbW5zpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651007696; a=rsa-sha256; cv=none; b=oeMLDtzXI1vWibsRd31VLVi5LE1J8p2v+1OdEQDnJ+8gki8MjB5NbD37KCvu78aBk4gknB yILAdKGHBVDaGsV6ofbKpF2+otBoWHzQZ29X4Ld5tKNxmQ/xvo/oLlGeI7AmPDg7yHgl9K dzlLt/e0NNdKAdwy98pXI5GrG4XKPCyg6tdkG3bfQ0+zuS4S/DLVg9LteYZXavoli8rqtc buamj3UYl34k3osxgduFoVANO4jXf/bQvK5+rY8YIdD5/EV0qxSx2FhozBDXr/ZPcEGj9p qftulQPisQ6RJqe4N+Z7YcZB+xlKDxBl1mGNFXhULYAFrA3CVJ19mMt43IqeOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 22. 4. 26., Guido Falsi wrote: > On 26/04/22 20:51, Christoph Moench-Tegeder wrote: >> The branch main has been updated by cmt: >> >> URL: >> https://cgit.FreeBSD.org/ports/commit/?id=48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c >> >> >> commit 48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c >> Author:     Christoph Moench-Tegeder >> AuthorDate: 2022-04-26 18:49:11 +0000 >> Commit:     Christoph Moench-Tegeder >> CommitDate: 2022-04-26 18:49:11 +0000 >> >>      www/firefox: fix build with sndio >>      upstream sndio handling was fixed for non-OpenBSD systems: >>      https://bugzilla.mozilla.org/show_bug.cgi?id=1351378 >>      so our own "fixing" actually broke build. >>      PR:             263587 >>      Reported by:    Robert Cina, jkim@ >> --- >>   Mk/bsd.gecko.mk | 5 +++++ >>   1 file changed, 5 insertions(+) >> >> diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk >> index eef9db747685..cee597e4e465 100644 >> --- a/Mk/bsd.gecko.mk >> +++ b/Mk/bsd.gecko.mk >> @@ -270,10 +270,15 @@ MOZ_OPTIONS+=    --disable-pulseaudio >>   .    if ${PORT_OPTIONS:MSNDIO} >>   BUILD_DEPENDS+=    ${LOCALBASE}/include/sndio.h:audio/sndio >> +MOZ_OPTIONS+=    --enable-sndio >> +.      if ${MOZILLA_VER:R:R} < 100 >>   post-patch-SNDIO-on: >>       @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ >>           -e '/DISABLE_LIBSNDIO_DLOPEN/d' \ >>           ${MOZSRC}/media/libcubeb/src/moz.build >> +.      endif >> +.    else >> +MOZ_OPTIONS+=    --disable-sndio >>   .    endif >>   .    if ${PORT_OPTIONS:MDEBUG} >> > > Unluckily this makes thunderbird fail: > > checking whether cross compiling... no > Traceback (most recent call last): >   File > "/wrkdirs/usr/ports/mail/thunderbird/work/thunderbird-91.8.1/configure.py", > line 226, in >     sys.exit(main(sys.argv)) >   File > "/wrkdirs/usr/ports/mail/thunderbird/work/thunderbird-91.8.1/configure.py", > line 50, in main >     sandbox.run(os.path.join(os.path.dirname(__file__), "moz.configure")) >   File > "/wrkdirs/usr/ports/mail/thunderbird/work/thunderbird-91.8.1/python/mozbuild/mozbuild/configure/__init__.py", > line 554, in run >     raise InvalidOptionError(msg) > mozbuild.configure.options.InvalidOptionError: Unknown option: > --disable-sndio > ===>  Script "configure" failed unexpectedly. > > > I'm trying to fix it locally, but thought to report it right away. I originally suggested something like this: diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index eef9db747685..450f1d998147 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -270,10 +270,18 @@ MOZ_OPTIONS+= --disable-pulseaudio . if ${PORT_OPTIONS:MSNDIO} BUILD_DEPENDS+= ${LOCALBASE}/include/sndio.h:audio/sndio +. if ${MOZILLA_VER} < 100 post-patch-SNDIO-on: @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ -e '/DISABLE_LIBSNDIO_DLOPEN/d' \ ${MOZSRC}/media/libcubeb/src/moz.build +. else +MOZ_OPTIONS+= --enable-sndio +. endif +. else +. if ${MOZILLA_VER} >= 100 +MOZ_OPTIONS+= --disable-sndio +. endif . endif . if ${PORT_OPTIONS:MDEBUG} But it was rejected because of "if ${MOZILLA_VER} < 100". :-( Something like this should fix it. diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index cee597e4e465..af3e496a05c5 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -270,15 +270,18 @@ MOZ_OPTIONS+= --disable-pulseaudio . if ${PORT_OPTIONS:MSNDIO} BUILD_DEPENDS+= ${LOCALBASE}/include/sndio.h:audio/sndio -MOZ_OPTIONS+= --enable-sndio . if ${MOZILLA_VER:R:R} < 100 post-patch-SNDIO-on: @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ -e '/DISABLE_LIBSNDIO_DLOPEN/d' \ ${MOZSRC}/media/libcubeb/src/moz.build +. else +MOZ_OPTIONS+= --enable-sndio . endif . else +. if ${MOZILLA_VER:R:R} >= 100 MOZ_OPTIONS+= --disable-sndio +. endif . endif . if ${PORT_OPTIONS:MDEBUG} Jung-uk Kim