[libdwarf] Update to 2.2.0 (#47743)

This commit is contained in:
Kai Pastor
2025-10-13 17:46:12 +02:00
committed by GitHub
parent a35597485c
commit 8de7ef973c
7 changed files with 15 additions and 28 deletions

View File

@@ -6,11 +6,11 @@ index 6e3761d..5124f29 100644
set_folder(dwarfdump src/bin/dwarfdump)
target_compile_definitions(dwarfdump PRIVATE
- "CONFPREFIX=${CMAKE_INSTALL_PREFIX}/lib" ${DW_LIBDWARF_STATIC})
+ "CONFPREFIX=${CMAKE_INSTALL_DATAROOTDIR}/libdwarf" ${DW_LIBDWARF_STATIC})
- "CONFPREFIX=${CMAKE_INSTALL_PREFIX}/lib" ${DW_LIBDWARF_STATIC}
+ "CONFPREFIX=${CMAKE_INSTALL_DATAROOTDIR}/libdwarf" ${DW_LIBDWARF_STATIC}
_GNU_SOURCE)
target_compile_options(dwarfdump PRIVATE ${DW_FWALL})
target_link_libraries(dwarfdump PRIVATE dwarf)
@@ -72,4 +72,4 @@ install(TARGETS dwarfdump DESTINATION
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

View File

@@ -2,12 +2,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28076ee..f9795dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,8 @@ endmacro()
set(LIBDWARF_CRT "MD" CACHE STRING "Either MT or MD, specifies whether to use the static or dynamic MSVCRT.")
@@ -45,6 +45,7 @@ macro(msvc_posix target)
endmacro()
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ set(LIBDWARF_CRT ignore)
+elseif(0)
set(LIBDWARF_CRT "MD" CACHE STRING "Either MT or MD, specifies whether to use the static or dynamic MSVCRT.")
# Use CMAKE_MSVC_RUNTIME in versions 3.15 and up
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
cmake_policy(SET CMP0091 NEW)

View File

@@ -1,16 +0,0 @@
diff --git a/src/lib/libdwarf/libdwarf_private.h b/src/lib/libdwarf/libdwarf_private.h
index b37ae994..7fa89256 100644
--- a/src/lib/libdwarf/libdwarf_private.h
+++ b/src/lib/libdwarf/libdwarf_private.h
@@ -26,11 +26,7 @@
#ifdef _MSC_VER /* Macro to select VS compiler */
#include <windows.h>
typedef SSIZE_T ssize_t;
-#ifdef _WIN64
-typedef long long off_t;
-#else
typedef long off_t;
-#endif
#endif /* _MSC_VER */
#ifndef TRUE

View File

@@ -2,13 +2,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO davea42/libdwarf-code
REF "v${VERSION}"
SHA512 b7ad4117bf24511a75080f6c3ab27335a055f8702f365b74fe7772b2eca35eaeda31bfa455603083232a80a634b00483a071541ff32810434f31ac83774475b0
SHA512 9fbf58e04e49816cb1f8e34362dd7c784476422896a88042bebd09778fad4a37cbf3f4c060f491b8d55bec610be37137b24a4910498499d3fcecf9da4aa78254
HEAD_REF main
PATCHES
include-dir.diff # avoid dwarf.h conflict with elfutils
dependencies.diff
msvc-runtime.diff
off_t.diff
dwarfdump-conf.diff # no absolute paths
)

View File

@@ -1,6 +1,6 @@
{
"name": "libdwarf",
"version": "2.1.0",
"version": "2.2.0",
"description": "A library for reading DWARF2 and later DWARF.",
"homepage": "https://github.com/davea42/libdwarf-code",
"license": null,

View File

@@ -4765,7 +4765,7 @@
"port-version": 0
},
"libdwarf": {
"baseline": "2.1.0",
"baseline": "2.2.0",
"port-version": 0
},
"libe57": {

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "db46d4e35bcf87e87410b99813e07d306fe2e554",
"version": "2.2.0",
"port-version": 0
},
{
"git-tree": "85261e682a6aa0820be75bf415562f526630a121",
"version": "2.1.0",