-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
libdwarf: add version 0.11.1 (#26101)
* libdwarf: add version 0.11.1 * Fix patches
- Loading branch information
1 parent
e2ab219
commit 0a29941
Showing
3 changed files
with
74 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index f219f078..d8a78136 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -228,6 +228,12 @@ if (ENABLE_DECOMPRESSION) | ||
set(HAVE_ZSTD_H TRUE) | ||
set(BUILT_WITH_ZLIB_AND_ZSTD TRUE) | ||
endif() | ||
+ find_package(zstd CONFIG REQUIRED) | ||
+ if(TARGET zstd::libzstd_shared) | ||
+ set(ZSTD_LIB zstd::libzstd_shared) | ||
+ else() | ||
+ set(ZSTD_LIB zstd::libzstd_static) | ||
+ endif() | ||
message(STATUS "Found libzstd : ${zstd_FOUND}") | ||
message(STATUS "Found zlib : ${ZLIB_FOUND}") | ||
message(STATUS "Build with zlib and zstd: ${BUILT_WITH_ZLIB_AND_ZSTD}") | ||
diff --git a/src/lib/libdwarf/CMakeLists.txt b/src/lib/libdwarf/CMakeLists.txt | ||
index 02787555..862c97b8 100644 | ||
--- a/src/lib/libdwarf/CMakeLists.txt | ||
+++ b/src/lib/libdwarf/CMakeLists.txt | ||
@@ -117,7 +117,7 @@ install(TARGETS dwarf | ||
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | ||
) | ||
|
||
-configure_file(libdwarf.pc.in libdwarf.pc @ONLY) | ||
+# configure_file(libdwarf.pc.in libdwarf.pc @ONLY) | ||
|
||
# The install has to be here, not in | ||
# another CMakeLists.txt to make install work properly | ||
@@ -140,5 +140,5 @@ export( | ||
NAMESPACE libdwarf:: | ||
FILE "${PROJECT_BINARY_DIR}/libdwarf-targets.cmake" | ||
) | ||
-install(FILES "${PROJECT_BINARY_DIR}/src/lib/libdwarf/libdwarf.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") | ||
+#install(FILES "${PROJECT_BINARY_DIR}/src/lib/libdwarf/libdwarf.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") | ||
install(FILES "${PROJECT_SOURCE_DIR}/cmake/Findzstd.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libdwarf") | ||
index 380d2ef7..8c62ee7e 100644 | ||
--- a/src/lib/libdwarf/libdwarf.h | ||
+++ b/src/lib/libdwarf/libdwarf.h | ||
@@ -51,7 +51,7 @@ | ||
#endif /* DW_API */ | ||
|
||
#ifndef LIBDWARF_STATIC | ||
-# if defined(_WIN32) || defined(__CYGWIN__) | ||
+# if defined(LIBDWARF_SHARED) && (defined(_WIN32) || defined(__CYGWIN__)) | ||
# ifdef LIBDWARF_BUILD | ||
# define DW_API __declspec(dllexport) | ||
# else /* !LIBDWARF_BUILD */ | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
versions: | ||
"0.11.1": | ||
folder: all | ||
"0.11.0": | ||
folder: all | ||
"0.10.1": | ||
|