diff --git a/packages/libelf/build.sh b/packages/libelf/build.sh index d4a79bcf5..0ecb7450c 100644 --- a/packages/libelf/build.sh +++ b/packages/libelf/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://sourceware.org/elfutils/ TERMUX_PKG_DESCRIPTION="ELF object file access library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.185 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=0.186 TERMUX_PKG_SRCURL="https://sourceware.org/elfutils/ftp/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2" -TERMUX_PKG_SHA256=dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6 +TERMUX_PKG_SHA256=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 # libandroid-support for langinfo. TERMUX_PKG_DEPENDS="libandroid-support, zlib, libcurl" TERMUX_PKG_BUILD_DEPENDS="argp, zstd, liblzma, libmicrohttpd, libsqlite, libarchive, libbz2" diff --git a/packages/libelf/src-elflint.patch b/packages/libelf/src-elflint.patch deleted file mode 100644 index 96fa9fb11..000000000 --- a/packages/libelf/src-elflint.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- elfutils-0.185/src/elflint.c 2021-05-22 23:55:24.000000000 +0530 -+++ elfutils-0.185-patch/src/elflint.c 2021-08-29 21:49:43.425999943 +0530 -@@ -3434,7 +3434,7 @@ - return p - (const unsigned char *) data->d_buf; - } - --inline size_t -+static inline size_t - buffer_left (Elf_Data *data, const unsigned char *p) - { - return (const unsigned char *) data->d_buf + data->d_size - p; diff --git a/packages/libelf/src-readelf.patch b/packages/libelf/src-readelf.patch deleted file mode 100644 index 83d054cf3..000000000 --- a/packages/libelf/src-readelf.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- elfutils-0.185/src/readelf.c 2021-05-22 23:55:24.000000000 +0530 -+++ elfutils-0.185-patch/src/readelf.c 2021-08-29 13:17:30.120999962 +0530 -@@ -8763,13 +8763,16 @@ - /* Apply the "operation advance" from a special opcode - or DW_LNS_advance_pc (as per DWARF4 6.2.5.1). */ - unsigned int op_addr_advance; -- inline void advance_pc (unsigned int op_advance) -- { -- op_addr_advance = minimum_instr_len * ((op_index + op_advance) -- / max_ops_per_instr); -- address += op_addr_advance; -- op_index = (op_index + op_advance) % max_ops_per_instr; -- } -+ #define advance_pc(op_advance_arg) \ -+ ({ \ -+ unsigned int op_advance = op_advance_arg; \ -+ op_addr_advance = \ -+ minimum_instr_len * ((op_index + (op_advance)) / max_ops_per_instr); \ -+ address += (op_advance); \ -+ op_index = (op_index + (op_advance)) % max_ops_per_instr; \ -+ }) -+ -+ - - if (max_ops_per_instr == 0) - {