From nobody Wed Jan 08 04:42:27 2025 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 4YSZyr0bNQz5kZZ6; Wed, 08 Jan 2025 04:42:28 +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 4YSZyq74Xgz4p6G; Wed, 8 Jan 2025 04:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736311348; 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=I+6wAgckLH+oedt3tuEgxLGLcF/xQesGx/T1zOJgymg=; b=uKAQvLFI7SEy3mqYwjrLWC34aI3E6V5th3cJqbMMZqT5KaXUl1SPqSmhUL2VJ0ymklIcrO 22Mg+Lf6H3nCRNBUR7iafGqABGYjdJ4fLzaINSX6w3QkRTj5Bi1urB7PJPd2j8beP4yH4H zCBjXsnhQuBreE7dd0dSwP7SXAm6ueeFZRgnyYt2Fl6Fx+/90aq4k0QIsZgqdcCsJYybRt KkjGmEv/SzNyt/bq8tHNxhS6NC0W6Qc+tMrPEP3u79OBLaycCHj9OnTneoK5DI+daAvFTR bBRKbCS1crkCqRmy1grQlQnj9xLdhpgaTl66sT7K90UkepWIBqa0Vm95JxgyJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736311348; 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=I+6wAgckLH+oedt3tuEgxLGLcF/xQesGx/T1zOJgymg=; b=PAD5Dg5nL/zYBmmG32T5d55tvuxfYk0mZibh9llg9VzXSq2hZTWqOOmZJIEseCDJ7WdJIr tzMomdrK3bqyj+AlZAE6NtHsfyEYlfm4DFPujbpOPe1WbHzpgdOZV9A7Fmju1qyv1VEd20 SjlUbXIQXwWhRmS7ma+IZAEpCvoc6MD0MnwkbVi61ud54cqmu0zY+a9MzrkzXqjXnskp2W xE/m0etgAVCKoWx/fMrhTkJMJMEt9U9TuLSs6cCbD7SwNKg4lMkJYI48vDQW49oP+0e+nG r9FkR78GcQMeAIulcaioNoce2w1/V9pBB3+87kW60TcIDVHXBmwkx0u9YiaMAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736311348; a=rsa-sha256; cv=none; b=QWrC2UrwMAJLo5YFNJR0MR7USZkPfM806ZuhCUv678lBd+CNwp9h1UK1J6ZZyc4YfjYqRU bRUmM6prgQex8j1nyDOEmXvea0JuNtgv4kTS/8FkuBA6s+ue/srO/I8PpCWxohJXGtKVI4 We31YSQ3ieDNMThMCa24Ixw8g5RZRnRmPZeE7EzUwPeQz9fT64QowKBjmCfsLtxmnZ8nq4 7hMAUqcWLzRSwNLWkbc8g/nNw7AuHj6AS6d/j8AFytjjtoWutlM5tcZZgghRnssDUNpzJ/ tEuRPMd4lsF6z1ubRvtAGEFHQn5a3YJUFBtBZ88O06hKC7Oa7dbcu1RfA5gYAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YSZyq6hFQzhg5; Wed, 08 Jan 2025 04:42:27 +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 5084gRBh007517; Wed, 8 Jan 2025 04:42:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5084gRup007514; Wed, 8 Jan 2025 04:42:27 GMT (envelope-from git) Date: Wed, 8 Jan 2025 04:42:27 GMT Message-Id: <202501080442.5084gRup007514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 7f8f120439b7 - main - libmagic: Unbreak for older FreeBSD releases. 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f8f120439b77e60a1070d87f4dc6cb9a43d0335 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=7f8f120439b77e60a1070d87f4dc6cb9a43d0335 commit 7f8f120439b77e60a1070d87f4dc6cb9a43d0335 Author: Xin LI AuthorDate: 2025-01-08 04:42:16 +0000 Commit: Xin LI CommitDate: 2025-01-08 04:42:16 +0000 libmagic: Unbreak for older FreeBSD releases. byteswap.h is introduced in FreeBSD 13.2 but was not available in earlier versions. In order to support upgrading from an earlier FreeBSD release we would need to tell the build system that fact. PR: bin/273736 Reported by: philip MFC after: 3 days --- lib/libmagic/config.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index 12cd382ab9bb..d642880d6096 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -1,6 +1,9 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ +/* FreeBSD */ +#include + /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -21,8 +24,10 @@ /* Define to 1 if you have the header file. */ #ifndef __APPLE__ /* Cross building tools on macOS */ +#if __FreeBSD_version >= 1400079 || (__FreeBSD_version < 1400000 && __FreeBSD_version >= 1302500) #define HAVE_BYTESWAP_H 1 #endif +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_BZLIB_H */