1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
diff -Naur dwgrep-0.4-orig/cmake/modules/FindDWARF.cmake dwgrep-0.4/cmake/modules/FindDWARF.cmake
--- dwgrep-0.4-orig/cmake/modules/FindDWARF.cmake 2018-04-07 18:42:44.000000000 +0300
+++ dwgrep-0.4/cmake/modules/FindDWARF.cmake 2025-07-03 13:07:57.214713662 +0300
@@ -56,16 +56,10 @@
PATH_SUFFIXES lib lib64
)
-find_library(EBL_LIBRARY
- NAMES ebl
- HINTS ${USER_LIBDW_LIB_PATH}
- PATH_SUFFIXES lib lib64
-)
-
if (DWARF_INCLUDE_DIR AND ELF_INCLUDE_DIR
- AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
+ AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
set(DWARF_FOUND TRUE)
- set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
+ set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
# check if libdw have the dwfl_module_build_id routine,
@@ -76,11 +70,11 @@
# into libelf.
check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
else (DWARF_INCLUDE_DIR AND ELF_INCLUDE_DIR
- AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
+ AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
set(DWARF_FOUND FALSE)
set(DWARF_LIBRARIES)
endif (DWARF_INCLUDE_DIR AND ELF_INCLUDE_DIR
- AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
+ AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
if (DWARF_FOUND)
if (NOT DWARF_FIND_QUIETLY)
@@ -89,7 +83,6 @@
message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
message(STATUS "Found libelf library: ${ELF_LIBRARY}")
- message(STATUS "Found libebl library: ${EBL_LIBRARY}")
endif (NOT DWARF_FIND_QUIETLY)
else (DWARF_FOUND)
if (DWARF_FIND_REQUIRED)
@@ -100,10 +93,10 @@
find_path(REDHAT redhat-release /etc)
if (FEDORA OR REDHAT)
if (NOT DWARF_INCLUDE_DIR OR NOT ELF_INCLUDE_DIR
- OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
+ OR NOT LIBDW_INCLUDE_DIR)
message(STATUS "Please install the elfutils-devel package")
endif (NOT DWARF_INCLUDE_DIR OR NOT ELF_INCLUDE_DIR
- OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
+ OR NOT LIBDW_INCLUDE_DIR)
if (NOT DWARF_LIBRARY)
message(STATUS "Please install the elfutils-libs package")
endif (NOT DWARF_LIBRARY)
@@ -120,9 +113,6 @@
if (NOT LIBDW_INCLUDE_DIR)
message(STATUS "Could NOT find libdw include dir")
endif (NOT LIBDW_INCLUDE_DIR)
- if (NOT EBL_LIBRARY)
- message(STATUS "Could NOT find libebl library")
- endif (NOT EBL_LIBRARY)
if (NOT DWARF_LIBRARY)
message(STATUS "Could NOT find libdw library")
endif (NOT DWARF_LIBRARY)
@@ -135,7 +125,7 @@
endif (DWARF_FOUND)
mark_as_advanced(DWARF_INCLUDE_DIR ELF_INCLUDE_DIR
- LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
+ LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR} ${ELF_INCLUDE_DIR})
message(STATUS "Checking availability of DWARF and ELF development libraries - done")
diff -Naur dwgrep-0.4-orig/libzwerg/CMakeLists.txt dwgrep-0.4/libzwerg/CMakeLists.txt
--- dwgrep-0.4-orig/libzwerg/CMakeLists.txt 2018-04-07 18:42:44.000000000 +0300
+++ dwgrep-0.4/libzwerg/CMakeLists.txt 2025-07-03 13:12:02.942262317 +0300
@@ -133,49 +133,49 @@
INSTALL (FILES ${libzwerg_HEADERS} DESTINATION include/libzwerg)
INSTALL (TARGETS libzwerg LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-ADD_EXECUTABLE (test-int test-int.cc int.cc)
-ADD_TEST (TestInt test-int)
-
-ADD_EXECUTABLE (test-parser
-
- $<TARGET_OBJECTS:LibzwergCore>
- test-parser.cc
-)
-ADD_TEST (TestParser test-parser)
-
-IF (GTEST_FOUND)
- SET (TESTCASE_DIR "--test-case-directory=${CMAKE_SOURCE_DIR}/tests/")
-
- ADD_LIBRARY (TestStub OBJECT test-stub.cc)
- ADD_LIBRARY (TestZwAux OBJECT test-zw-aux.cc parser.hh)
-
- ADD_EXECUTABLE (test-dw test-dw.cc
- $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:TestZwAux> ${LibzwergAll})
- TARGET_LINK_LIBRARIES (test-dw
- ${GTEST_LIBRARIES} ${LIBELF_LIBRARY} ${DWARF_LIBRARIES})
- ADD_TEST (TestDw test-dw ${TESTCASE_DIR})
-
- ADD_EXECUTABLE (test-op test-op.cc
- $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:TestZwAux>
- $<TARGET_OBJECTS:LibzwergCore>)
- TARGET_LINK_LIBRARIES (test-op ${GTEST_LIBRARIES})
- ADD_TEST (TestOp test-op ${TESTCASE_DIR})
-
- ADD_EXECUTABLE (test-value-cst test-value-cst.cc
- $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:LibzwergCore>)
- TARGET_LINK_LIBRARIES (test-value-cst ${GTEST_LIBRARIES})
- ADD_TEST (TestValueCst test-value-cst ${TESTCASE_DIR})
-
- ADD_EXECUTABLE (test-builtin-cmp test-builtin-cmp.cc
- $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:LibzwergCore>)
- TARGET_LINK_LIBRARIES (test-builtin-cmp ${GTEST_LIBRARIES})
- ADD_TEST (TestBuiltinCmp test-builtin-cmp ${TESTCASE_DIR})
-
- ADD_EXECUTABLE (test-coverage test-coverage.cc coverage.cc
- $<TARGET_OBJECTS:TestStub>)
- TARGET_LINK_LIBRARIES (test-coverage ${GTEST_LIBRARIES})
- ADD_TEST (TestBuiltinCoverage test-coverage ${TESTCASE_DIR})
-ENDIF ()
+# ADD_EXECUTABLE (test-int test-int.cc int.cc)
+# ADD_TEST (TestInt test-int)
+#
+# ADD_EXECUTABLE (test-parser
+#
+# $<TARGET_OBJECTS:LibzwergCore>
+# test-parser.cc
+# )
+# ADD_TEST (TestParser test-parser)
+#
+# IF (GTEST_FOUND)
+# SET (TESTCASE_DIR "--test-case-directory=${CMAKE_SOURCE_DIR}/tests/")
+#
+# ADD_LIBRARY (TestStub OBJECT test-stub.cc)
+# ADD_LIBRARY (TestZwAux OBJECT test-zw-aux.cc parser.hh)
+#
+# ADD_EXECUTABLE (test-dw test-dw.cc
+# $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:TestZwAux> ${LibzwergAll})
+# TARGET_LINK_LIBRARIES (test-dw
+# ${GTEST_LIBRARIES} ${LIBELF_LIBRARY} ${DWARF_LIBRARIES})
+# ADD_TEST (TestDw test-dw ${TESTCASE_DIR})
+#
+# ADD_EXECUTABLE (test-op test-op.cc
+# $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:TestZwAux>
+# $<TARGET_OBJECTS:LibzwergCore>)
+# TARGET_LINK_LIBRARIES (test-op ${GTEST_LIBRARIES})
+# ADD_TEST (TestOp test-op ${TESTCASE_DIR})
+#
+# ADD_EXECUTABLE (test-value-cst test-value-cst.cc
+# $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:LibzwergCore>)
+# TARGET_LINK_LIBRARIES (test-value-cst ${GTEST_LIBRARIES})
+# ADD_TEST (TestValueCst test-value-cst ${TESTCASE_DIR})
+#
+# ADD_EXECUTABLE (test-builtin-cmp test-builtin-cmp.cc
+# $<TARGET_OBJECTS:TestStub> $<TARGET_OBJECTS:LibzwergCore>)
+# TARGET_LINK_LIBRARIES (test-builtin-cmp ${GTEST_LIBRARIES})
+# ADD_TEST (TestBuiltinCmp test-builtin-cmp ${TESTCASE_DIR})
+#
+# ADD_EXECUTABLE (test-coverage test-coverage.cc coverage.cc
+# $<TARGET_OBJECTS:TestStub>)
+# TARGET_LINK_LIBRARIES (test-coverage ${GTEST_LIBRARIES})
+# ADD_TEST (TestBuiltinCoverage test-coverage ${TESTCASE_DIR})
+# ENDIF ()
IF (SPHINX_EXECUTABLE)
ADD_EXECUTABLE (dwgrep-gendoc dwgrep-gendoc.cc ${LibzwergAll})
diff -Naur dwgrep-0.4-orig/libzwerg/stack.hh dwgrep-0.4/libzwerg/stack.hh
--- dwgrep-0.4-orig/libzwerg/stack.hh 2018-04-07 18:42:44.000000000 +0300
+++ dwgrep-0.4/libzwerg/stack.hh 2025-07-03 13:08:51.814809257 +0300
@@ -31,6 +31,7 @@
#define _STK_H_
#include <memory>
+#include <stdexcept>
#include <vector>
#include "value.hh"
|