diff --git a/elfutils-0.178-libasm-ebl.patch b/elfutils-0.178-libasm-ebl.patch new file mode 100644 index 0000000..784c62b --- /dev/null +++ b/elfutils-0.178-libasm-ebl.patch @@ -0,0 +1,146 @@ +commit 985550a5b24009e9cb9e511f6d320f3ac1b6bf99 +Author: Mark Wielaard +Date: Wed Jan 8 15:04:50 2020 +0100 + + libasm.h: Don't include libebl.h. Define an opaque Ebl handle. + + Using libasm isn't really usable without a way to create an Ebl handle. + But we don't support libebl.h (and libebl itself). Just define the + Ebl handle as an opaque struct. Code that uses it needs to figure out + how to instantiate one itself (they cannot in any supportable way...) + + Signed-off-by: Mark Wielaard + +diff --git a/libasm/libasm.h b/libasm/libasm.h +index 5c61224..a45c9fa 100644 +--- a/libasm/libasm.h ++++ b/libasm/libasm.h +@@ -32,7 +32,7 @@ + #include + #include + +-#include ++typedef struct ebl Ebl; + + + /* Opaque type for the assembler context descriptor. */ +diff --git a/libasm/libasmP.h b/libasm/libasmP.h +index 54460cf..a4703fc 100644 +--- a/libasm/libasmP.h ++++ b/libasm/libasmP.h +@@ -31,6 +31,7 @@ + + #include + ++#include "libebl.h" + #include + + #include "libdwelf.h" +diff --git a/tests/asm-tst1.c b/tests/asm-tst1.c +index 9afc676..cdf2a92 100644 +--- a/tests/asm-tst1.c ++++ b/tests/asm-tst1.c +@@ -20,6 +20,7 @@ + #endif + + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst2.c b/tests/asm-tst2.c +index 2556d0c..9e88b70 100644 +--- a/tests/asm-tst2.c ++++ b/tests/asm-tst2.c +@@ -20,6 +20,7 @@ + #endif + + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst3.c b/tests/asm-tst3.c +index e52cfbe..39c1d90 100644 +--- a/tests/asm-tst3.c ++++ b/tests/asm-tst3.c +@@ -20,6 +20,7 @@ + #endif + + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst4.c b/tests/asm-tst4.c +index 52e9e20..5114938 100644 +--- a/tests/asm-tst4.c ++++ b/tests/asm-tst4.c +@@ -20,6 +20,7 @@ + #endif + + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst5.c b/tests/asm-tst5.c +index 5a29b01..dcb852f 100644 +--- a/tests/asm-tst5.c ++++ b/tests/asm-tst5.c +@@ -20,6 +20,7 @@ + #endif + + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst6.c b/tests/asm-tst6.c +index bd9b362..829cd90 100644 +--- a/tests/asm-tst6.c ++++ b/tests/asm-tst6.c +@@ -19,6 +19,7 @@ + # include + #endif + ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst7.c b/tests/asm-tst7.c +index 00cb2bf..9017976 100644 +--- a/tests/asm-tst7.c ++++ b/tests/asm-tst7.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst8.c b/tests/asm-tst8.c +index 4fb0d99..a65509f 100644 +--- a/tests/asm-tst8.c ++++ b/tests/asm-tst8.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include +diff --git a/tests/asm-tst9.c b/tests/asm-tst9.c +index b6d0e43..681e872 100644 +--- a/tests/asm-tst9.c ++++ b/tests/asm-tst9.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include ELFUTILS_HEADER(ebl) + #include ELFUTILS_HEADER(asm) + #include + #include diff --git a/elfutils.spec b/elfutils.spec index 1063735..659c997 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,6 +1,6 @@ Name: elfutils Version: 0.178 -%global baserelease 6 +%global baserelease 7 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -59,6 +59,7 @@ Patch2: elfutils-0.178-debuginfod-no-cache.patch Patch3: elfutils-0.178-curl-code-gcc-10.patch Patch4: elfutils-0.178-compressed-vmlinuz.patch Patch5: elfutils-0.178-debuginfod-timeoutprogress.patch +Patch6: elfutils-0.178-libasm-ebl.patch %description Elfutils is a collection of utilities, including stack (to show @@ -255,6 +256,7 @@ such servers to download those files on demand. %patch3 -p1 -b .curl-gcc-10 %patch4 -p1 -b .vmlinuz %patch5 -p1 -b .debuginfod-timeout-progress +%patch6 -p1 -b .libasm-ebl # In case the above patches added any new test scripts, make sure they # are executable. @@ -432,8 +434,9 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog -* Fri Jan 10 2019 Mark Wielaard +* Fri Jan 10 2020 Mark Wielaard - 0.178-7 - Add elfutils-0.178-debuginfod-timeoutprogress.patch +- Add elfutils-0.178-libasm-ebl.patch * Wed Dec 11 2019 Mark Wielaard - 0.178-6 - Add elfutils-0.178-curl-code-gcc-10.patch