From nobody Wed Mar 29 00:57:52 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 4PmSp82WNQz42gWP; Wed, 29 Mar 2023 00:57:52 +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 4PmSp81yGvz3lnY; Wed, 29 Mar 2023 00:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680051472; 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=24bZEHKCvJey6uiqDz7gjjhdyum7faZfiQ4nCSoYTZI=; b=t53pxXO6HTuoV7CfKXofZ9UIrqRmrmmMvebmJYI9t9Dv9elB1QbgPsJ8sLkAb5hzBNPePv AY/XGPnkjzw1PqF2QXL2qeEy+KxTNCPqpfu/AlzT14/6kqP3cFlbG/YQiZ2C3sJd+KPZzd xAofflEgqfmz8DgDnp8v9DWfnowHpjWKeNj+Lyl/HBeUEYEBT9sQVJHYGHuv0nGnK/EFxU 2nvrlCTpNhDViiwaEI1nM8pFza4uaFTdTHsMYV43adwqKkEcfQAKVV4pZHvI3tR/uauksB jaOJrZO9lLqkKF1xtA2Q9yEypN0wa275jfv31QjrYy599shWEAieQ3FYtVF32Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680051472; 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=24bZEHKCvJey6uiqDz7gjjhdyum7faZfiQ4nCSoYTZI=; b=fQKDagi6BB87tp10XrKzNFwshdSzqRoyGAFNTz5SjAWvLmCF1snQobcenYe3oyaIkoaW1J 4yqGY5bjlct1J/yzBPglozePAqHoNMt3jcqa8wTYeGIQixEyVmSyc0XRoV1dMcUgvaGF+x yOJfDBMtDdZ+wrNfdGLeIJDuEgRrUj5+KqUNhMNdxVAmsRXQAJYzK+ugKBFAJJV34np5xV SJjoOIv0jQe2b+5alvelrUwey9b8GDyWPmKF8ROF3yYXpWG9wlHVUgi5c1bgNWPiYZFsHq SPEjrHYcHVKi5+MfC/fckZfCs5h9MeKt8Ip6XB37a19l77AVSDxjClmau0M8dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680051472; a=rsa-sha256; cv=none; b=lWwjU4p/Ts0yNhNEa/f1vhJyg6yzI3Fgw3m+hFwWMqUX+JyZxKKyZJeGDQT2YfFsWMdmEE PsjGbOXFe3z1facY6xVM0FyihTZOQe8bTKUFKjjMzqprgXpHa4XdqiCYOyUg32crbEPf/p B+AaUzYeFCM2wyuWkU0o/SVtlseSH8p/n6yfWVkfYE2O/U6ghRqsEaCSpaeWfVL7acTFMh 53A2VZy1PHp9bFrJOnzcP9NEDHnFywH3qyyJPljKEOxgBHCMIHAV4Le/93S6tfLf/00uR0 i1A01ps2f3JC/ApHywHJT8sR4IcNfnyaxqqgdNMWonlK/PwACxQ346HCuvEJjg== 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 4PmSp80yVgz1Pvc; Wed, 29 Mar 2023 00:57:52 +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 32T0vqvb060335; Wed, 29 Mar 2023 00:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T0vq9E060334; Wed, 29 Mar 2023 00:57:52 GMT (envelope-from git) Date: Wed, 29 Mar 2023 00:57:52 GMT Message-Id: <202303290057.32T0vq9E060334@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: d8ac6c8bc77f - main - lang/spidermonkey{78,102}: 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: d8ac6c8bc77ffb66fbb1d4a9cd8fb698114ae231 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8ac6c8bc77ffb66fbb1d4a9cd8fb698114ae231 commit d8ac6c8bc77ffb66fbb1d4a9cd8fb698114ae231 Author: Charlie Li AuthorDate: 2023-03-29 00:46:46 +0000 Commit: Charlie Li CommitDate: 2023-03-29 00:46:46 +0000 lang/spidermonkey{78,102}: 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 --- lang/spidermonkey102/Makefile | 16 +++++++++------- lang/spidermonkey78/Makefile | 9 +++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lang/spidermonkey102/Makefile b/lang/spidermonkey102/Makefile index f29e41ca64d6..a7b178eea542 100644 --- a/lang/spidermonkey102/Makefile +++ b/lang/spidermonkey102/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 \ @@ -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-jemalloc \ --disable-tests \ @@ -77,11 +76,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 diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile index 4588ec31f255..539818c29fb3 100644 --- a/lang/spidermonkey78/Makefile +++ b/lang/spidermonkey78/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 \ @@ -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 \ @@ -80,6 +79,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure + @${FIND} ${WRKSRC}/build/pymake ${WRKSRC}/python/mozbuild -name *.py -exec \ + ${REINPLACE_CMD} "s|'rU'|'r'|g" {} \; post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs