From nobody Tue May 03 06:22:36 2022 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 4717A1ABF259; Tue, 3 May 2022 06:22:38 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4KsqdB1H6Lz3JYb; Tue, 3 May 2022 06:22:38 +0000 (UTC) (envelope-from mikael@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651558958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7OjnFLSptb0ZAQPR9fSHNj33i9Tz4vvfGUInv4R9gg0=; b=duHD53Kc3s2NZL9/7/hmO8tVtnQv31sTtHn0aOUgrTH74hDH8nMR1IoCIHMCwS1bVwqEH1 i69mAvFAqqRGhU1CHXluCn6LadHpix3uDBWbYv1+A3DbLpxwOhQi71u/BBefuHXBvJ323f NJRCDtLzT6AYchNi8gdrUIa2S1WnUKCsTw+biAaKL5nb8cqCiMVFKycxSTlZPy04wERWgE zaAC1qazrOWNzsqEWUPTdI2Ma/dIqk5dayahHPALKqdcjkIIr63DWeKWUcwnem3qIpcb0T 0bLT/l2gEm5N1QdQ6O1sLuQWBYqFKh1zchNTsY4nDTwMYrLlginZnqqpHTNeVg== Received: from [147.171.68.35] (desktop-016.gipsa-lab.grenoble-inp.fr [147.171.68.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: mikael) by smtp.freebsd.org (Postfix) with ESMTPSA id 8F37E2318E; Tue, 3 May 2022 06:22:37 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Content-Type: multipart/alternative; boundary="------------BjH4miGa0V8nP1WmkKmJhL5y" Message-ID: <2fb8edc2-66c6-9c38-a60a-c27170d6f2f2@FreeBSD.org> Date: Tue, 3 May 2022 08:22:36 +0200 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: git: 15b1da831b7c - main - lang/sbcl: Add aarch64 support Content-Language: en-US To: Kirill Ponomarev Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202205030531.2435VnSg087811@gitrepo.freebsd.org> From: =?UTF-8?Q?Mika=c3=abl_Urankar?= In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651558958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7OjnFLSptb0ZAQPR9fSHNj33i9Tz4vvfGUInv4R9gg0=; b=dgZskCfUqAR/pySenhLUgPubhKu1dbf2Ll4/4e58Ba0lFPsw30tn7E2K10JdlgPMF2N6XR 5Vuh0uBJUwP7zOblhckW/Jky74ICrDg34HIlhGe6zuY0aDYCwB4SgB0psOw7pN9mByQzJH 4XIV0mnurrO9b9veipvSMrGCjzje799mTfZnCdtPliQ48NsNYm7M8pHIDXuXkfqNwADjpq fvwwko2ZjltRyVjnhWfQswpJOZtIBqohHns1p/p6AaVLgrA/ulXXviSIKlNknWd2vKPL/E 48OhH9y5brVylLh79+LSVZcaBEFNKeKbVIfLkIPvw+WIP5ApAcRXW6+2mstk8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651558958; a=rsa-sha256; cv=none; b=N3qag9QVvQUETvnL9mv4rqxert9W7GQDXKIwlPPpzWrZWUnDHDxopp3cMisnCEaTPgW601 NVw6OUeo1GqwRat7VB5SYsD4LbkADRMK9ooN3A2vKurgM+c++aHEc25B11rCcIfZF9nS+z otB6MLHRbLxfxN5TVV8fRB3i2wndwbAWEbFRZusEdYARPy/2YooKERmAFAl4sOsFNjNSIe 42AjnmKPIqFb7w76CRs93P5JFpKBHWOWtOsU9uY0t9W/aiDKlB0Vs6YBdY/CTjWze2LeuF Lf5LZ+uS9u8ZEUx9hYKQeLSDmkMWMG2RcEc450CuIK6mVyYGdUXhjDjP0uuTXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N This is a multi-part message in MIME format. --------------BjH4miGa0V8nP1WmkKmJhL5y Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 03/05/2022 08:02, Kirill Ponomarev wrote: > Did you test it before you merged it? It seems tarballs in distinfo are > missing. > > On 05/03, Mikael Urankar wrote: >> The branch main has been updated by mikael: >> >> URL:https://cgit.FreeBSD.org/ports/commit/?id=15b1da831b7cbebe2762fccebcfb3b0d50b27fc9 >> >> commit 15b1da831b7cbebe2762fccebcfb3b0d50b27fc9 >> Author: Mikael Urankar >> AuthorDate: 2022-04-04 11:00:54 +0000 >> Commit: Mikael Urankar >> CommitDate: 2022-05-03 05:22:17 +0000 >> >> lang/sbcl: Add aarch64 support >> >> PR: 261096 >> Reported by: Robert Clausecker >> Approved by: krion (maintainer timeout) >> --- >> lang/sbcl/Makefile | 15 ++++++++++----- >> 1 file changed, 10 insertions(+), 5 deletions(-) >> >> diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile >> index 5266d38ca984..b857d293f8f1 100644 >> --- a/lang/sbcl/Makefile >> +++ b/lang/sbcl/Makefile >> @@ -18,7 +18,7 @@ LICENSE= BSD2CLAUSE PD >> LICENSE_COMB= dual >> LICENSE_FILE= ${WRKSRC}/COPYING >> >> -ONLY_FOR_ARCHS= amd64 i386 >> +ONLY_FOR_ARCHS= aarch64 amd64 i386 >> >> LIB_DEPENDS= libgmp.so:math/gmp \ >> libmpfr.so:math/mpfr >> @@ -75,6 +75,8 @@ SAFEPOINT_VARS_OFF= MAKE_SH_ARGS+="--without-sb-safepoint --without-sb-thruption >> SBCL_DISTFILES= ${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}-binary${EXTRACT_SUFX}:binaries >> SBCL_VARS= XC_HOST="${BOOT_WRKSRC}/src/runtime/sbcl --core ${BOOT_WRKSRC}/output/sbcl.core --noinform --disable-debugger --no-sysinit --no-userinit" >> >> +XC_HOST="ecl" >> + >> THREADS_VARS= MAKE_SH_ARGS+="--with-sb-thread" >> THREADS_VARS_OFF= MAKE_SH_ARGS+="--without-sb-thread" >> >> @@ -87,7 +89,10 @@ XREF_VARS_OFF= MAKE_SH_ARGS+="--without-sb-xref-for-internals" >> ZLIB_VARS= MAKE_SH_ARGS+="--with-sb-core-compression" >> ZLIB_VARS_OFF= MAKE_SH_ARGS+="--without-sb-core-compression" >> >> -BOOTVERSION= 1.2.7 >> +BOOTVERSION= ${BOOTVERSION_${ARCH}} >> +BOOTVERSION_aarch64= 2.2.0 >> +BOOTVERSION_i386= 1.2.7 >> +BOOTVERSION_amd64= 1.2.7 >> CONMODULES= asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency sb-cover \ >> sb-executable sb-gmp sb-grovel sb-introspect sb-md5 sb-mpfr \ >> sb-posix sb-queue sb-rotate-byte sb-rt sb-simple-streams \ >> @@ -98,12 +103,12 @@ MAKE_SH_ARGS?= --prefix="${PREFIX}" --xc-host="${XC_HOST}" >> .if defined(DYNAMIC_SPACE_SIZE) >> MAKE_SH_ARGS+= --dynamic-space-size=${DYNAMIC_SPACE_SIZE} >> .endif >> -SBCL_BOOT_LIST= ${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \ >> - ${BOOTVERSION}-x86-64-dragonfly >> +SBCL_BOOT_LIST= ${BOOTVERSION}-arm64-freebsd ${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \ >> + ${BOOTVERSION}-x86-64-dragonfly \ >> >> .include >> >> -ARCHOS_PATTERN= *-${ARCH:S/amd64/x86-64/:S/i386/x86/}-${OPSYS:tl}* >> +ARCHOS_PATTERN= *-${ARCH:S/aarch64/arm64/:S/amd64/x86-64/:S/i386/x86/}-${OPSYS:tl}* >> BOOT_WRKSRC= ${WRKDIR}/${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}} >> >> .if ${PORT_OPTIONS:MLINKABLE_RUNTIME} yes, I've done a poudriere testport before the commit on both aarch64 and amd64. The testport was successfull on both arch I got a merged conflict and forgot to readd the distinfo for aarch64 It's fixed in 1e4acb02a9bfdf003e20dd6627e2f49beeaa12e5 --------------BjH4miGa0V8nP1WmkKmJhL5y Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit
On 03/05/2022 08:02, Kirill Ponomarev wrote:
Did you test it before you merged it? It seems tarballs in distinfo are
missing.

On 05/03, Mikael Urankar wrote:

The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=15b1da831b7cbebe2762fccebcfb3b0d50b27fc9

commit 15b1da831b7cbebe2762fccebcfb3b0d50b27fc9
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-04-04 11:00:54 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-05-03 05:22:17 +0000

    lang/sbcl: Add aarch64 support
    
    PR:             261096
    Reported by:    Robert Clausecker
    Approved by:    krion (maintainer timeout)
---
 lang/sbcl/Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 5266d38ca984..b857d293f8f1 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -18,7 +18,7 @@ LICENSE=	BSD2CLAUSE PD
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
@@ -75,6 +75,8 @@ SAFEPOINT_VARS_OFF=	MAKE_SH_ARGS+="--without-sb-safepoint --without-sb-thruption
 SBCL_DISTFILES=	${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}-binary${EXTRACT_SUFX}:binaries
 SBCL_VARS=	XC_HOST="${BOOT_WRKSRC}/src/runtime/sbcl --core ${BOOT_WRKSRC}/output/sbcl.core --noinform --disable-debugger --no-sysinit --no-userinit"
 
+XC_HOST="ecl"
+
 THREADS_VARS=		MAKE_SH_ARGS+="--with-sb-thread"
 THREADS_VARS_OFF=	MAKE_SH_ARGS+="--without-sb-thread"
 
@@ -87,7 +89,10 @@ XREF_VARS_OFF=	MAKE_SH_ARGS+="--without-sb-xref-for-internals"
 ZLIB_VARS=	MAKE_SH_ARGS+="--with-sb-core-compression"
 ZLIB_VARS_OFF=	MAKE_SH_ARGS+="--without-sb-core-compression"
 
-BOOTVERSION=	1.2.7
+BOOTVERSION=		${BOOTVERSION_${ARCH}}
+BOOTVERSION_aarch64=	2.2.0
+BOOTVERSION_i386=	1.2.7
+BOOTVERSION_amd64=	1.2.7
 CONMODULES=	asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency sb-cover \
 		sb-executable sb-gmp sb-grovel sb-introspect sb-md5 sb-mpfr \
 		sb-posix sb-queue sb-rotate-byte sb-rt sb-simple-streams \
@@ -98,12 +103,12 @@ MAKE_SH_ARGS?=	--prefix="${PREFIX}" --xc-host="${XC_HOST}"
 .if defined(DYNAMIC_SPACE_SIZE)
 MAKE_SH_ARGS+=	--dynamic-space-size=${DYNAMIC_SPACE_SIZE}
 .endif
-SBCL_BOOT_LIST=	${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \
-		${BOOTVERSION}-x86-64-dragonfly
+SBCL_BOOT_LIST=	${BOOTVERSION}-arm64-freebsd ${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \
+		${BOOTVERSION}-x86-64-dragonfly \
 
 .include <bsd.port.options.mk>
 
-ARCHOS_PATTERN=	*-${ARCH:S/amd64/x86-64/:S/i386/x86/}-${OPSYS:tl}*
+ARCHOS_PATTERN=	*-${ARCH:S/aarch64/arm64/:S/amd64/x86-64/:S/i386/x86/}-${OPSYS:tl}*
 BOOT_WRKSRC=	${WRKDIR}/${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}
 
 .if ${PORT_OPTIONS:MLINKABLE_RUNTIME}

yes, I've done a poudriere testport before the commit on both aarch64 and amd64.
The testport was successfull on both arch
I got a merged conflict and forgot to readd the distinfo for aarch64
It's fixed in 1e4acb02a9bfdf003e20dd6627e2f49beeaa12e5
--------------BjH4miGa0V8nP1WmkKmJhL5y--