From nobody Thu Nov 16 20:54:49 2023 X-Original-To: dev-commits-src-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 4SWXNB3jdmz5155k; Thu, 16 Nov 2023 20:54:50 +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 4SWXN970KFz4HGZ; Thu, 16 Nov 2023 20:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700168090; 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=YjiCwMKHx8lTdJPD4RWu2RwTKSbqoonFZ13c0OcHTVw=; b=l8yPJWA/Iy+kSGF1JszVf4ysDZd3FDgHp/4oxTVtItT2GFZ9Zm+hPi9q1iVz629vcLvMwu tYy6EJ6L3+N1ENGKznNeZ1PYZcK8blx04FH1JYRGmNaN58H4Jp2laf5VHfZfOKdl9y4bHV VozwHw6FMqmQ2r/pXrSSTX7vFXZy4EbO3dUn2Mw2aHq6mLyKRDQ5lk6CEfbNpnGs5szrQc DlHezZ6Rj8cWCzg2sxO7mQ60dkrOFN4Vj8ZtA9d15ZsVVNp3HEOJHWpmTau0+Q3wwLyPpy S0vYZcWSmpkVf5z8A21Gxc2+Etbm/mRFDhiYVT0x3F0ZjnRV341VJTsljm2s3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700168090; 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=YjiCwMKHx8lTdJPD4RWu2RwTKSbqoonFZ13c0OcHTVw=; b=fKaadZbEdyE1Q6qu/z2xz0WCfVezwXJ8JUTmXy1O7HmoDrhuNHlwrz0Bg1q87ts6OiYxNJ DREG7TL8ZsLKLLSrDjwsuRHqvr1UcV07WQpZu3lNavJCgqnzrv1rMlLY7QtW1QFNxHmVWr CoM6j3Y7/udfy/unB9LtDwHTeCdf6TJCLsaLvKj27QhHDBjR0NivjlwSNgnbocixM0zn/W COdVfVJrCXWjS3zLaoYz0aAhUsTjYPLyQmhoNjtD2t2OmFRDqYYJy+nzME4KARIDPc8xNj 9NF48puPtLHOg2Z4Z51KlugHZtBUoR1Zoj9+vfKvzIKKcOp17mVeHx0ITkqaaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700168090; a=rsa-sha256; cv=none; b=mXz77m2AswDatJxWLD6NlT1BtNBcpUdR2zgtlEIcaQXkOQqZfF0cX6Y7Glrj0Rw2zN9AEg cvrxbRVgDdiAB06FcLTsbGGBDVBxzCigEgDSIbH3+IV2WGZ9rlKzme6MZ4ZbSiBWMST3Qq Q4mcyHKWzQC7E/wnUg9EmCPNY+oMyNS3W8Fp5OMjvjN2wz73oOUQsp7XB7cQy9tooI+wEM 2mdcQM94ZkUfzYxSjQCsObtfINg0SuxJbmPt24srxzoa09iQ3ZsVSUSIlFI398SN7WSAOs TY3VtiHRSxI/lVBILV+o0B6OLXleEW2UjGwoQveb1qTRLHHTcBQTM8dvBA7lGQ== 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 4SWXN964rcz1KY; Thu, 16 Nov 2023 20:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AGKsn43054099; Thu, 16 Nov 2023 20:54:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGKsnDp054096; Thu, 16 Nov 2023 20:54:49 GMT (envelope-from git) Date: Thu, 16 Nov 2023 20:54:49 GMT Message-Id: <202311162054.3AGKsnDp054096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7d1321288ad9 - stable/14 - stand: Rename LIBFDT to LIBSAFDT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d1321288ad980182b188834c6e81b568058190a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d1321288ad980182b188834c6e81b568058190a commit 7d1321288ad980182b188834c6e81b568058190a Author: Mark Johnston AuthorDate: 2023-11-07 14:57:32 +0000 Commit: Mark Johnston CommitDate: 2023-11-16 15:18:58 +0000 stand: Rename LIBFDT to LIBSAFDT Preemptively address a collision with LIBFDT (to be added in the future) from src.libnames.mk, which gets included via bsd.progs.mk. No functional change intended. Reviewed by: imp MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D42486 (cherry picked from commit b247ff70e8f1b4bf184b9fc85d2908ec4db2d1ab) --- stand/efi/loader/Makefile | 4 ++-- stand/fdt.mk | 2 +- stand/kboot/Makefile | 4 ++-- stand/powerpc/ofw/Makefile | 4 ++-- stand/uboot/Makefile | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 3ce9ac169bd1..5a755c1d329f 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -122,7 +122,7 @@ ${LOADER}.efi: ${PROG} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a -DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT} -LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT} +LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} .include diff --git a/stand/fdt.mk b/stand/fdt.mk index 56c9ff95b5ad..1b3df587d0db 100644 --- a/stand/fdt.mk +++ b/stand/fdt.mk @@ -4,5 +4,5 @@ CFLAGS+= -I${FDTSRC} CFLAGS+= -I${BOOTOBJ}/fdt CFLAGS+= -I${SYSDIR}/contrib/libfdt CFLAGS+= -DLOADER_FDT_SUPPORT -LIBFDT= ${BOOTOBJ}/fdt/libfdt.a +LIBSAFDT= ${BOOTOBJ}/fdt/libfdt.a .endif diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index f5049a1c19c0..b9d68cddf97d 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -63,7 +63,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} CFLAGS+= -Wall -DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} +LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} .include diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile index 2beb315a4d41..3e4c92220fac 100644 --- a/stand/powerpc/ofw/Makefile +++ b/stand/powerpc/ofw/Makefile @@ -59,8 +59,8 @@ LDFLAGS+= -T ${.CURDIR}/ldscript.powerpc LIBOFW= ${BOOTOBJ}/libofw/libofw.a CFLAGS+= -I${BOOTSRC}/libofw -DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} +LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} MK_PIE= no diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index 1cc4abe86d9b..83ac5949cbb3 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -78,7 +78,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ubldr ubldr.bin ubldr.pie: ${OBJS} .endif -DPADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA} +LDADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA} .include