From nobody Wed Mar 29 12:57:51 2023 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 4Pmmmv4sRfz42WmS; Wed, 29 Mar 2023 12:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pmmmv4Lzjz4FRv; Wed, 29 Mar 2023 12:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680094671; 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; bh=7tunIDn6chzyLq34PPFFd13H13ZHjjXd6zMPLKpywek=; b=B8/YkPVl2AWf88B/U6eI7f18nh8zJ5RXdMoml1qRI3aZkAMOmoZ2ETowibonk76EcecU6C Z5UWYUSb+k9fL84/vwE+01onG/4zpSDlWyyX9O8to/7HbuLBQNL6VkGdW/GwUQifGU3TB0 NshwpGSAeCM/IKmETrkGhximRDaAXDHt499o1if0I61f05b16vHfKcRKrd9xDByiOwewqI JZ7ec8jV3dTinUdWZtG7F/Dl6GV9CrQKuzlcAvWsKP0CdTumiTda2fT47Rbx6wQ/hmRHfc Yo7/+MIsep10u6oguzaj08PNxctDZsps3t/e0xUen2gLXTRziEao6szXNXf2SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680094671; 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; bh=7tunIDn6chzyLq34PPFFd13H13ZHjjXd6zMPLKpywek=; b=l6tV+BrfWwS7hK3sadIWr41rJnP+EbKIz4rf9mcN5ePZIkQekL7fwj0JSykhab/X3aEZNh dJeFNRF7uPqkPFKJdNQIDAVBrj1/r4wm459F2z9T92qG4+rEBV4CCSOzvuNnLdARzF7cQj B1X0P/0/hl2sgWzBG/tBflH8V+oGGUZWj/tiB3vtzroQCK8GVJdYo4CDjY3hyEW4wF39EF g6XKr64r01h9Rh7Zbho5B0LXxv5A3Ay2EJ9nj5ixSLZ4S2BOg6NyD0J8v0upRtqmlEP+Bv g0pBMFQV0CvKXeXlVMaZlIyilBP/ZtjrQDLk5+ab1bAgRdZ4aPwYpomJa+OflA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680094671; a=rsa-sha256; cv=none; b=OufgEmZZQpXqmXDb+vTFL7DLNu9dy0I2hNvDp9zT/mgMJ8LX7aRlgYoFavJXfKTw4nHmK1 7vxqWbIvR9TCF0N+IB7T3qDL2v1y0vO/KGkpugrHntGEZCNRDwtpuye54sduobnQQpkhod xnOUknECYwZ8t8bHIACzsh91NEjYJn2RinbNTxV6/zjlYVZoqsDAETgWR7H9FzDZoY5Tob 4qz7fHcRaKYllrA0Xz4VkDoZ2RPOr9u4qojcNlBQ65Xaay61g6cXr9a1lezlV/S0BgFj0B e2VZP5Ekc+c23SfN5fvaJE3xzsmuCgiIQKPGgRKR91VMNvk8gcfhJKgarCdrGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmmmv35sfzVms; Wed, 29 Mar 2023 12:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TCvpBF045457; Wed, 29 Mar 2023 12:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TCvp1R045456; Wed, 29 Mar 2023 12:57:51 GMT (envelope-from git) Date: Wed, 29 Mar 2023 12:57:51 GMT Message-Id: <202303291257.32TCvp1R045456@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: cde108d7b316 - main - lang/spidermonkey91: fix build with Python 3.11 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cde108d7b316aafbe4a077034fe6eeb68969b7af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=cde108d7b316aafbe4a077034fe6eeb68969b7af commit cde108d7b316aafbe4a077034fe6eeb68969b7af Author: Charlie Li AuthorDate: 2023-03-29 12:54:34 +0000 Commit: Charlie Li CommitDate: 2023-03-29 12:57:31 +0000 lang/spidermonkey91: fix build with Python 3.11 open(), io.open() et al no longer accept 'U' ("universal newline") in the file mode; the flag had been deprecated since Python 3.3. [0] Failed during configure. While here, remove duplicate Python dependency line and use root configure script. References: [0] https://docs.python.org/3/whatsnew/3.11.html#porting-to-python-3-11 Requested by: fluffy --- lang/spidermonkey91/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lang/spidermonkey91/Makefile b/lang/spidermonkey91/Makefile index a7a0594ff002..e47ca2abafe2 100644 --- a/lang/spidermonkey91/Makefile +++ b/lang/spidermonkey91/Makefile @@ -13,8 +13,7 @@ WWW= https://spidermonkey.dev/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ - ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ +BUILD_DEPENDS= ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ autoconf2.13:devel/autoconf2.13 \ rust-cbindgen>=0.8.7:devel/rust-cbindgen LIB_DEPENDS= libffi.so:devel/libffi \ @@ -22,7 +21,7 @@ LIB_DEPENDS= libffi.so:devel/libffi \ libnspr4.so:devel/nspr USES= compiler:c++17-lang gmake localbase pathfix pkgconfig \ - python:3.7-3.10,build readline tar:xz + python:build readline tar:xz USE_LDCONFIG= yes SP_VER= 91 HAS_CONFIGURE= yes @@ -30,9 +29,9 @@ HAS_CONFIGURE= yes WRKSRC= ${WRKDIR}/firefox-${DISTVERSION}/ PATCH_WRKSRC= ${WRKDIR}/firefox-${DISTVERSION}/ CONFIGURE_OUTSOURCE= yes -CONFIGURE_SCRIPT= ../firefox-${DISTVERSION}/js/src/configure -CONFIGURE_ARGS= --disable-debug \ +CONFIGURE_ARGS= --enable-application=js \ + --disable-debug \ --disable-debug-symbols \ --disable-gold \ --disable-jemalloc \ @@ -78,11 +77,14 @@ CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif -pre-configure: - (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure + @${FIND} ${WRKSRC}/python/mozbuild -name *.py -exec \ + ${REINPLACE_CMD} 's|"rU"|"r"|g' {} \; + +pre-configure: + (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) + (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs