From nobody Mon Feb 13 17:14:47 2023 X-Original-To: dev-commits-ports-main@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 4PFrYg2vhhz3rVCZ; Mon, 13 Feb 2023 17:14:47 +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 4PFrYg2RLPz3mcH; Mon, 13 Feb 2023 17:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676308487; 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=BvZq3OKHQ0t4EpDG89p8GVHrFhKFcEsrcbho6SMRJiQ=; b=OlqRqPLFJ0fNrsoLHxy9wYAY89SCwNfURRiCWgaSO76ZTS/h4T7NpNgYsm0H6yUSLYlt39 +e4l6VMdqtXqzaEg8vKYP6rc4W+NzsvH19RrGPO83jornivHPdPI3o4eXCpxDm7aoEgKiD pXrAWSRntmT92WOvAguKj8qHBkW76HOWXQmsTA/uhs/XugvApLYU0YPZKv1Rx6B4IpAoAz pXLx/gKIOA3Y2RD7oysGpVSJjvTZmTXdOXMqk19t5I9UREIf/FyA0wFU8lfYQrrUXsDkMr 7zOZyDtItaHg+TZsHfZsXhN6Q/RquLAKKeXQvjn63l0jA0d5OAqPNKnZ/7Kb8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676308487; 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=BvZq3OKHQ0t4EpDG89p8GVHrFhKFcEsrcbho6SMRJiQ=; b=PJrxCPTLvXFdOtzBHLFqp0fD1jnyzyEA7BA1wZJaUHyalaJU63OJbSByJYsa1QfLgEqtgs pf/LVI0eECYoAFEPelAU/2YGJ8BhKFdjEGyTd/l41ATHAI8JESv7wAK+BgK+msH4CLAMy5 7A7XRDfiQs/7VVg2mZwReExc11cHRn6S1G2P1QLqyPOBDfUGbgVZgc97hcsEGFJo7eAGWU Y5BYiq71sxn7Kpr5Luqq7aXrBdQem1VWjdytqOH/mQiR2oax/UH9PeYDa6cj02Yk8NgriV cTY+R/zvCZQx6yY9q3Rzwfh4BnznDDvgAvOBxMEYHK9pcunWqUapz3dJo8emEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676308487; a=rsa-sha256; cv=none; b=yShPmPk+1hr/ellLNZUIwEGjyZ4l5Cimo6kle7FErBy6WM8l2EnyJ5foEc20PmY/IAbp46 rW0V4UtBShD3Q9aci7W/j4RzSCN/D1VnZrONYwSg7IwNRLW3DebEfAPy3IQFT2T7utuq+E FbCl0e8Y5qYAsS2geP4gDtSHwdhceK2rrrGhF6gCRVmn+Mw+RZF38UQu9ifVuaDRL4YkS0 vRuQnt99C+4KyXZbkLX9QXGxohpwDDLGLWHdlunTGN618FJM7IIf2lurrOcgBrvSLhdSUd W4V8IqRnaBoYTaL1Mzi0H4pNqibcCs3vOqrNofnIuUx/mduRwG9lPxZFJHsa0Q== 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 4PFrYg1VqYzQrl; Mon, 13 Feb 2023 17:14:47 +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 31DHEl0M025643; Mon, 13 Feb 2023 17:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DHElgA025642; Mon, 13 Feb 2023 17:14:47 GMT (envelope-from git) Date: Mon, 13 Feb 2023 17:14:47 GMT Message-Id: <202302131714.31DHElgA025642@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: da17cd55f0ad - main - lang/spidermonkey102: Fix build on 12.x List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da17cd55f0add82bef10b8863d94ebe97b106d4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=da17cd55f0add82bef10b8863d94ebe97b106d4a commit da17cd55f0add82bef10b8863d94ebe97b106d4a Author: John Hein AuthorDate: 2023-02-13 17:13:45 +0000 Commit: Neel Chauhan CommitDate: 2023-02-13 17:13:45 +0000 lang/spidermonkey102: Fix build on 12.x PR: 269241 --- lang/spidermonkey102/Makefile | 2 -- lang/spidermonkey102/files/patch-moz.configure | 14 +++++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lang/spidermonkey102/Makefile b/lang/spidermonkey102/Makefile index 636f95efde5d..5b46f6f45726 100644 --- a/lang/spidermonkey102/Makefile +++ b/lang/spidermonkey102/Makefile @@ -13,8 +13,6 @@ WWW= https://spidermonkey.dev/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12= ERROR: Cannot find readelf - BUILD_DEPENDS= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ autoconf2.13:devel/autoconf2.13 \ diff --git a/lang/spidermonkey102/files/patch-moz.configure b/lang/spidermonkey102/files/patch-moz.configure index 94ae8c5f0b07..40a6a8adbcc3 100644 --- a/lang/spidermonkey102/files/patch-moz.configure +++ b/lang/spidermonkey102/files/patch-moz.configure @@ -1,7 +1,9 @@ - Fix awk detection +- also look in stderr for readelf --help output (elftoolchain bsd readelf) + Index: moz.configure ---- moz.configure.orig 2022-03-30 19:25:49 UTC +--- moz.configure.orig 2022-10-10 09:55:56 UTC +++ moz.configure @@ -708,7 +708,7 @@ add_old_configure_assignment("CLANG_PLUGIN", clang_plu @@ -12,3 +14,13 @@ Index: moz.configure # Until the AWK variable is not necessary in old-configure +@@ -812,7 +812,8 @@ def validate_readelf(path): + # option in the `--help` output, which fortunately, s compatible between + # llvm-readelf and readelf. + retcode, stdout, stderr = get_cmd_output(path, "--help") +- return retcode == 0 and any(l.startswith(" -d ") for l in stdout.splitlines()) ++ return retcode == 0 and (any(l.startswith(" -d ") for l in stdout.splitlines()) \ ++ or any(l.startswith(" -d ") for l in stderr.splitlines())) + + + @depends("--enable-compile-environment", target, host)