diff --git a/packages/dwarves/CMakeLists.txt.patch b/packages/dwarves/CMakeLists.txt.patch index edbaa38fe4..fcc08d9e41 100644 --- a/packages/dwarves/CMakeLists.txt.patch +++ b/packages/dwarves/CMakeLists.txt.patch @@ -1,9 +1,12 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -85,23 +85,6 @@ - - _set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${__LIB}" "libdir") +@@ -76,24 +76,7 @@ + endif() + if (NOT DEFINED LIB_INSTALL_DIR) +- set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +-endif() +- -# libbpf uses reallocarray, which is not available in all versions of glibc -# libbpf's include/tools/libc_compat.h provides implementation, but needs -# COMPACT_NEED_REALLOCARRAY to be set @@ -19,8 +22,7 @@ -" HAVE_REALLOCARRAY_SUPPORT) -if (NOT HAVE_REALLOCARRAY_SUPPORT) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCOMPAT_NEED_REALLOCARRAY") --endif() -- - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") ++ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") + endif() - if (NOT LIBBPF_FOUND) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") diff --git a/packages/dwarves/build.sh b/packages/dwarves/build.sh index ef3707c331..23fe838a75 100644 --- a/packages/dwarves/build.sh +++ b/packages/dwarves/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/ TERMUX_PKG_DESCRIPTION="Pahole and other DWARF utils" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.27" +TERMUX_PKG_VERSION="1.28" TERMUX_PKG_SRCURL=https://fedorapeople.org/~acme/dwarves/dwarves-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=81e227af6fe6a3228d64211a80209f7cd86022a6bd48c53302124cef76154505 +TERMUX_PKG_SHA256=a4c1a3c16c7d41f27eba8323e05b59fe33581832d5c50ef8390fa102d75a16e3 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="argp, libdw, libelf, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-D__LIB=lib"