From nobody Sat Sep 05 23:58:14 2026 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 4hcqzJ4rpzz6rLcr for ; Sat, 05 Sep 2026 23:58:20 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hcqzH6nwhz3GRT for ; Sat, 05 Sep 2026 23:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788652700; 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=WLoxO+TjsAc/+SQMt+BuVrgHma6tFDJjvg1NDNAD7GE=; b=youc95oqD+mteawpBkyUb4ivybpiAv1Cl+8eqEuCDjVLYb0yVFXwvfWtjJeoBplDOCRZst V6UH2zxPvdl/ZOTDtgvV6skz9F05yGUr2d0rdOMhQBZzv6fiSHBLg8+QHyKDeffAduOrUZ s00n5YhIMu0dc+7DePX3puQr12Ee0EG99elMpJFonf3SF8U7cvMQUHmgze/bLxCaGcb1P6 JsVva4you4NpoaV8HfSOa/J5J2fZahy+n951hXMvlsyXa+APjD88TgZJ73nyGjxCMhHSWf TjsbHNblvmGuiDdY+FiIISjoYCWzL+//wZSLB+YLZePBz9VSldhnDOnTWhCfBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788652700; a=rsa-sha256; cv=none; b=xFcC+N0HYHbwwQPZp1EqQfhtrld97LWN2YIpcy597BiS7Ae1Jd0sQKxpgWMWwX5B4e5xtp m8NpL8aKFft1wbLQRI0i7TBH0pNJNd9P7rl9i2oy6wbjEPsGyiqiUt/PM+Ap63Po1+pzp4 u0XHvvl0yD94p8uHyXMHYh4xAk5Xks9Fawl/8mOD1mtGfKN3L6K6Wa89BKgHvomcZ6t2SA c+I5stlrGmAZDUXqK0lxPaEKoDYq+TN9os5DQemTRoFMNXat8i7WXupAjGof6ycEBoSaqh nL5HCYydtLaSqAkYeboErafziPPrZI7ULQUihZre5B8f4bdFuaECyN5A/zMTIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788652700; 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=WLoxO+TjsAc/+SQMt+BuVrgHma6tFDJjvg1NDNAD7GE=; b=APFHHwTNUGui2rGXqCdVIm3pagzWD5gAQKhaGzypkESqIUyirXZblT9OGvGewjfH982cPB KC8665nRiVzvZol+43EkAZa8pPEmDOP4c8IQGcbJqECZdlkb7/CMVtDGa1RMyffRI0IFno MCrrXE4i9aqGvUH4b9JDmXct82u03VaAZ+d/Pv1axC8Jksat8UjYcvUkNpixfIIs5u8dl+ /zo86da4I9P5NAUoMFG4gy28cmTNRRxkVWbuyodW6Ny8WxDkLvMZNWmJAzrKjMAMd6Db0D GQLuVlD82nDXW2rn0Tal/2Bub8KCE+GS7WSEBIRFqsw6gMkhs/u06QpVY+Ox2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcqzH2j0qz168K for ; Sat, 05 Sep 2026 23:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24cc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 23:58:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 8929675e11c0 - main - libmagic: Add swap.c and magic.h to SRCS. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8929675e11c0c64ff96a2441082794980c9c6b2e Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 23:58:14 +0000 Message-Id: <6a9cac96.24cc8.398523ec@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8929675e11c0c64ff96a2441082794980c9c6b2e commit 8929675e11c0c64ff96a2441082794980c9c6b2e Author: Xin LI AuthorDate: 2026-09-05 01:03:17 +0000 Commit: Xin LI CommitDate: 2026-09-05 23:57:30 +0000 libmagic: Add swap.c and magic.h to SRCS. file 5.48 added swap.c and swap.h for byte-swapping operations, which are required on hosts that lack or (e.g. macOS cross-building or older FreeBSD bootstrap environments). Also add magic.h to SRCS so object files depend on the generated header before compiling, avoiding falling back to the host's /usr/include/magic.h during parallel builds. Reported by: wosch MFC after: 1 week Fixes: 7af41682a96b ("MFV: file 5.48") --- lib/libmagic/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index fe04f5ea68c8..bbb02eb7e7bf 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -19,7 +19,9 @@ SRCS= apprentice.c apptype.c ascmagic.c buffer.c cdf.c cdf_time.c \ compress.c der.c encoding.c fsmagic.c funcs.c is_json.c \ is_csv.c \ is_simh.c \ - is_tar.c magic.c print.c readcdf.c readelf.c seccomp.c softmagic.c + is_tar.c magic.c print.c readcdf.c readelf.c seccomp.c softmagic.c \ + swap.c +SRCS+= magic.h INCS= magic.h MAGICPATH?= /usr/share/misc @@ -62,7 +64,7 @@ CLEANFILES+= mkmagic DEPENDOBJS+= mkmagic build-tools: mkmagic # For the non-dirdeps build, HOST_CC is CC by default -mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META} +mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c swap.c ${INCS} ${BUILD_TOOLS_META} ${HOST_CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ ${.ALLSRC:N*.h:O:u} ${LDADD}