From nobody Thu Oct 17 19:54:56 2024 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 4XTz803KY3z5ZQXC; Thu, 17 Oct 2024 19:54:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTz802ptgz4hDF; Thu, 17 Oct 2024 19:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729194896; 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=uOCcHF9TeBjFEyx+pdoEKAcTN6TpK2zcAGYpvelqsAo=; b=tSBB5kzSRkUspg45oHXcbUfh04hjADXLXbGkIQfrGg+Zb1ck6pOEvFiqc16TtkYcdTLkBh 2qymqx3FvDMhUpYFu4+m97li1OsbW9dbpYKVcs0GVXVKsvYzru4AkXQjOxPuvwqwv36Jso EZbMHcfmrKooNyMGGZabY1LGbFkHaMpDAynErpoDKsuvWbTWmbJmlI+sdZB0dGqG2VaLEM J6ZvVb8vVo5dOhCrmpupBTx9qgh1LqNqVdwP+Sj5FnPKQmAYebRmc9/n7MASuSsRSIZzEB C8m6mdBeZUkYBNse/NoPQsNwhHZBUWFIAaKqHLtTvPhXrhitdxdYIUVmEzqzjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729194896; 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=uOCcHF9TeBjFEyx+pdoEKAcTN6TpK2zcAGYpvelqsAo=; b=Rjvnk/HgfuZuZ6y5aJePMsPy3B9tAdCtjBOVWknFmf+20qMKmoAj3t062HQ+ppaBadU1q+ R6bSox6/p1uCV+D5b8OzUv3ZKRwYivy/faNUCIEzWiDNNuyLp1ieuIrMmGMG60FzmM2WI0 UyIJZqA5+Gk23ANxrDsXbLf9X01aqwlBIEA6wmnSaBe7vf1larzrNOz429Vv3vXnqGM/UT LZwPtez4Viqgrh8nv5tu8tDAad4oRLBo6/xU3fYGgYVReH1N+FgiyPWj0M0DkGbC9FYHuz HfYm+mM1tZpT4xRtBE/dh4tFXec8qoBPMQQRic9tt5ph3Ly1QqpTf/5eAhKs+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729194896; a=rsa-sha256; cv=none; b=KS4qDXalXIZWsIgod7j/YfYxLiayHmY9Ohz118+mNFdUaD4ixyrUfummyByXp+kUapPoA+ qgTFlOc6vObU3TI9jvI2mC/5pE6qk2GvSMTxasSnCroVCsvt7gk40O3SuJR0GS+mCgVCvk cTyvFjvFIYB5xP7mPLnYc2TtyuVSPmUPv1g1/2ulGShhk+S8TbxSfTC9Qmbv7HOeAQp8PD 16aFI3TUZXluNavq9n8BlqLBP1yKZ28Ujt7nDeKKqIWARrbo6KbH6veMmGWRSCpPzGSaVH C4IqV2TGaBscIiZcDFrmPYAbOmL5ruj4XbkPAzT66amShzZCAjS4X4HT6R8x7g== 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 4XTz802P2yz135m; Thu, 17 Oct 2024 19:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HJsu93078080; Thu, 17 Oct 2024 19:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HJsuie078077; Thu, 17 Oct 2024 19:54:56 GMT (envelope-from git) Date: Thu, 17 Oct 2024 19:54:56 GMT Message-Id: <202410171954.49HJsuie078077@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: ea2a77b789f4 - main - devel/xtensa-esp-elf: Fix toolchain version string 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea2a77b789f4db0790a248bd6ff9996054e9e5bc Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea2a77b789f4db0790a248bd6ff9996054e9e5bc commit ea2a77b789f4db0790a248bd6ff9996054e9e5bc Author: Craig Leres AuthorDate: 2024-10-17 19:54:35 +0000 Commit: Craig Leres CommitDate: 2024-10-17 19:54:35 +0000 devel/xtensa-esp-elf: Fix toolchain version string xtensa-esp32-elf-cc was reporting: xtensa-esp-elf-cc (crosstool-NG UNKNOWN) 13.2.0 Update to correctly show the version of crosstool used: xtensa-esp-elf-cc (crosstool-NG esp-13.2.0_20240530) 13.2.0 --- devel/xtensa-esp-elf/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/devel/xtensa-esp-elf/Makefile b/devel/xtensa-esp-elf/Makefile index 3b9ccfdce9fc..a34b7a88edaa 100644 --- a/devel/xtensa-esp-elf/Makefile +++ b/devel/xtensa-esp-elf/Makefile @@ -1,6 +1,6 @@ PORTNAME= xtensa-esp-elf DISTVERSION= 13.2.0_20240530 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://github.com/espressif/crosstool-NG/releases/download/esp-${DISTVERSION}/:source1 \ GNU/gmp:source2 \ @@ -74,7 +74,7 @@ CARGO_CARGOTOML= ${WRKSRC2}/Cargo.toml CARGO_CARGOLOCK= ${WRKSRC2}/Cargo.lock WRKSRC2= ${WRKDIR}/esp-toolchain-bin-wrappers-${TAG_WRAPPERS}/gnu-xtensa-toolchian -ESPVER= ${DISTNAME:tl:S/-src$//:S/-esp-/-/} +ESPVER= esp-${DISTVERSION} ESPDATE= 20240305 GCCVER= 13.2.0 PLIST_SUB= PKGBASE=$(PKGBASE) \ @@ -103,6 +103,10 @@ post-extract: ${LN} -s \ ${DISTDIR}/espressif-newlib-esp32-esp-4.3.0_${ESPDATE}_GH0.tar.gz \ ${TARBALLS}/newlib-esp32-esp-4.3.0_${ESPDATE}.tar.gz + ${CP} -p ${BUILD_WRKSRC}/maintainer/git-version-gen \ + ${BUILD_WRKSRC}/maintainer/git-version-gen- + ${PRINTF} "#!/bin/sh\necho -n '${ESPVER}'\n" > \ + ${BUILD_WRKSRC}/maintainer/git-version-gen # Use a new crosstool.config that lets us download a # branch/tag tarball instead of doing "git clone" @@ -112,9 +116,6 @@ post-extract: do-configure: cd ${BUILD_WRKSRC} && ./bootstrap - ${PRINTF} "#!/bin/sh\necho '${ESPVER}'\n" > \ - ${BUILD_WRKSRC}/version.sh - ${CHMOD} -w+x ${BUILD_WRKSRC}/version.sh cd ${BUILD_WRKSRC} && \ ${SETENV} ${BUILD_ENV} LIBS=-lintl \ ./configure --prefix=${WRKDIR}/ct-ng --exec-prefix=${WRKDIR}/ct-ng