From nobody Wed Nov 06 13:40:20 2024 X-Original-To: dev-commits-src-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 4Xk5tY4B0Kz5cby6; Wed, 06 Nov 2024 13:40:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk5tY2Cm7z46dV; Wed, 6 Nov 2024 13:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730900421; 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=vqVkcLPeuhIpxVKyAzkisQrAa9P0N6RW9uxQFKQn0RU=; b=wVDXAsr5+OzVb0IwGJYH/rjEla8sE5GVfvUKApG86xjtVEoPGqzeE/DH7xTv0oVWQQhTuq rCGu8VkSsZcvNR5+fR9Fqp3gFAPXExP9gw9oySFL8QS5CGyQINAK16LiPxBtKM27VGBjJ0 rPHoR/qbypiT8wWV/l9+9dOUETAGqQiGiYcE7pTO0H8mqKLXMDAwLGbXZZn1eWSrnkMVNP d9316hr0DvWWLxZpg39WjudPLQyEIT4sRWpWpagXoPV1S0XHTs7zVeSTQ8F8+0K5qQ+lke pyTCLeMmSwRG5Bhwa5bggW+1pfYmO3OxVYml2xEXFDKlxLuN+kU8ILXh1E+vqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730900421; 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=vqVkcLPeuhIpxVKyAzkisQrAa9P0N6RW9uxQFKQn0RU=; b=apTZYdeJ1Oi7dbL6BEtaZZCsurRBgq0jqv0GnrpKCI5MBM3x956qk6b+RLOFs6YDCotOvq db0e7PPU7tH73UM08xA0cSi/7MW89gp+x2mNIVbXiVv/FA2U7e3fIenDJWCTE0jHtLdyAa ZerL6U6/ounbPVNwOxPrEQ9g/yfKUIBFqsmjeNv+evSREqp6AiGJEgpYUx6iB5Xh3r+uht i9lDtb0l7uHGCv7d5QRuIBbTZukxWZOoQrG5or4R/jkI51a5Z/JTnkt6IUpZU6zKvChfr+ p/1XPzWxQdiQFM86ajkOrrHOLAt4+RV69N3RkqueZNz9wI8N+pMFjuUcHGzrSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730900421; a=rsa-sha256; cv=none; b=xyEGkvjPwrfwifPqE5l5zkM46tcsIePCbolITESA6jafGKOxqGRnrj3USNB6c0N8okdl/g xtQr8fK3JFUXCKYUY2FBPg/i7xxcaRdMcZcZq/6NuQOCKh/wi9PMBWt17EZYByeo+PtUBD fIpo1Ay2i6wUDINgcZo1bea+SthZnYP+sYe4+wNcjAyB298XwgjhJwrn6J1eCHMOOIrEAI qW2L1W/wG0Xl8dRZkiwUaKxO5wX4dvN4BKlWBjkz4VOS6O0ahM3l2GU1+1q74uDwf6Rtit aa4hETNwWuvGhakGO1cqQCmfI0T6SBipPGjoMcfVsQHpMKqOeh7uQeLHH7avqw== 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 4Xk5tY0FVyz133g; Wed, 6 Nov 2024 13:40:21 +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 4A6DeKmu064402; Wed, 6 Nov 2024 13:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6DeKBt064399; Wed, 6 Nov 2024 13:40:20 GMT (envelope-from git) Date: Wed, 6 Nov 2024 13:40:20 GMT Message-Id: <202411061340.4A6DeKBt064399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4d692868a673 - main - compile_et: reduce the dependency chain for bootstrap tools. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d692868a6730ebf72a1d1a619af89af6fc8d763 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4d692868a6730ebf72a1d1a619af89af6fc8d763 commit 4d692868a6730ebf72a1d1a619af89af6fc8d763 Author: Baptiste Daroussin AuthorDate: 2024-11-06 11:16:09 +0000 Commit: Baptiste Daroussin CommitDate: 2024-11-06 13:39:57 +0000 compile_et: reduce the dependency chain for bootstrap tools. Fix the build on macOS The bootstrap tools are statically linked, so our build system will provide the full dependency chain which pulls in libcrypt. since recently libcrypt.a is a linker script not supported by macOS ar(1), given that compile_et does not use at all the function from libroken which brings the dependency on libcrypt, bypass LIBADD dependency chain by using the old LDADD/DPADD mechanism, like it is done for other kerberos related bootstrap tools. --- usr.bin/compile_et/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile index 6305bfe3ddfd..621ba3dd101d 100644 --- a/usr.bin/compile_et/Makefile +++ b/usr.bin/compile_et/Makefile @@ -4,7 +4,18 @@ PACKAGE= kerberos PROG= compile_et SRCS= compile_et.c parse.y lex.l -LIBADD= roken vers +.if defined(BOOTSTRAPPING) +# compiler_et does not need the full libroken but just a bunch of the file +# in there, the buildsystem we have will trigger the full dependency chain +# when linking statically including libcrypt, which is a ldscript, not +# supported by macOS ar(1). +LIBROKEN_A= ${.OBJDIR:H:H}/kerberos5/lib/libroken/libroken.a +LDADD= ${LIBROKEN_A} +DPADD= ${LIBROKEN_A} +.else +LIBADD= roken +.endif +LIBADD+= vers CFLAGS+=-I. -I${SRCTOP}/contrib/com_err WARNS?= 0