From 0a5728c33e07b2d40aaede9d5fdb930ccf98f256 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Fri, 29 May 2026 17:25:01 +0800 Subject: [PATCH] [dtc] Update to 1.8.1 (#52058) --- ports/dtc/0001-enable-static-or-shared.patch | 32 -------------------- ports/dtc/portfile.cmake | 11 +------ ports/dtc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dtc.json | 5 +++ 5 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 ports/dtc/0001-enable-static-or-shared.patch diff --git a/ports/dtc/0001-enable-static-or-shared.patch b/ports/dtc/0001-enable-static-or-shared.patch deleted file mode 100644 index 48595948ca..0000000000 --- a/ports/dtc/0001-enable-static-or-shared.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/libfdt/meson.build b/libfdt/meson.build -index bf8343f..c2f4bd6 100644 ---- a/libfdt/meson.build -+++ b/libfdt/meson.build -@@ -26,7 +26,7 @@ else - endif - - link_args += version_script --libfdt = both_libraries( -+libfdt = library( - 'fdt', sources, - version: meson.project_version(), - link_args: link_args, -@@ -34,17 +34,11 @@ libfdt = both_libraries( - install: true, - ) - --if static_build -- link_with = libfdt.get_static_lib() --else -- link_with = libfdt.get_shared_lib() --endif -- - libfdt_inc = include_directories('.') - - libfdt_dep = declare_dependency( - include_directories: libfdt_inc, -- link_with: link_with, -+ link_with: libfdt, - ) - - install_headers( diff --git a/ports/dtc/portfile.cmake b/ports/dtc/portfile.cmake index c76e32a623..461e856904 100644 --- a/ports/dtc/portfile.cmake +++ b/ports/dtc/portfile.cmake @@ -6,18 +6,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dgibson/dtc REF "v${VERSION}" - SHA512 5cf48c8bd426919bb8aad6a8866e063305eca830547f8ceb5fe7746bc85a8d6a0a1e13fd29432cb389d3d51337368f217077aabf9436b526e77d425b33167694 + SHA512 93a65d2e18995907f70d3033d83ac9b246e1589dff255c4e018bfd2c2ff8b9153130728ebc28d1d0adba7e077d9354de7a781f95f5c3f636547c08338d85ef8d HEAD_REF main - PATCHES - 0001-enable-static-or-shared.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(STATIC_BUILD true) -else() - set(STATIC_BUILD false) -endif() - vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -26,7 +18,6 @@ vcpkg_configure_meson( -Dvalgrind=disabled -Dpython=disabled -Dtests=false - "-Dstatic-build=${STATIC_BUILD}" ) vcpkg_install_meson() diff --git a/ports/dtc/vcpkg.json b/ports/dtc/vcpkg.json index 5542c3f7c5..02b6cefb1b 100644 --- a/ports/dtc/vcpkg.json +++ b/ports/dtc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dtc", - "version": "1.7.2", + "version": "1.8.1", "description": "Device Tree Compiler (dtc) toolchain for working with device tree source and binary files and also libfdt, a utility library for reading and manipulating the binary format.", "homepage": "https://github.com/dgibson/dtc", "license": "GPL-2.0-or-later OR BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 0cf081c228..39408a36df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2633,7 +2633,7 @@ "port-version": 0 }, "dtc": { - "baseline": "1.7.2", + "baseline": "1.8.1", "port-version": 0 }, "dtl": { diff --git a/versions/d-/dtc.json b/versions/d-/dtc.json index c1a6699046..7080b4dd04 100644 --- a/versions/d-/dtc.json +++ b/versions/d-/dtc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09623f508c719fc9f17b5fc0216d1986712f4f53", + "version": "1.8.1", + "port-version": 0 + }, { "git-tree": "09cf1dc350d443ca61f4374a51069fc2b2b67522", "version": "1.7.2",