diff --git a/srcpkgs/pahole/patches/fix-libebl-missing.patch b/srcpkgs/pahole/patches/fix-libebl-missing.patch new file mode 100644 index 00000000000..851269f03ad --- /dev/null +++ b/srcpkgs/pahole/patches/fix-libebl-missing.patch @@ -0,0 +1,71 @@ +--- cmake/modules/FindDWARF.cmake.orig ++++ cmake/modules/FindDWARF.cmake +@@ -37,14 +37,9 @@ + PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64 + ) + +-find_library(EBL_LIBRARY +- NAMES ebl +- PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64 +-) +- +-if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY) ++if (DWARF_INCLUDE_DIR 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, i.e. if it supports the buildid +@@ -52,10 +47,10 @@ + # in distributions such as fedora). We do it against libelf because, IIRC, some distros + # include libdw linked statically into libelf. + check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID) +-else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY) ++else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY) + set(DWARF_FOUND FALSE) + set(DWARF_LIBRARIES) +-endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY) ++endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY) + + if (DWARF_FOUND) + if (NOT DWARF_FIND_QUIETLY) +@@ -63,7 +58,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) +@@ -73,9 +67,9 @@ + find_path(FEDORA fedora-release /etc) + find_path(REDHAT redhat-release /etc) + if (FEDORA OR REDHAT) +- if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY) ++ if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR) + message(STATUS "Please install the elfutils-devel package") +- endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY) ++ endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR) + if (NOT DWARF_LIBRARY) + message(STATUS "Please install the elfutils-libs package") + endif (NOT DWARF_LIBRARY) +@@ -89,9 +83,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) +@@ -103,7 +94,7 @@ + endif (DWARF_FIND_REQUIRED) + endif (DWARF_FOUND) + +-mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY) ++mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY) + include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h) + diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template index f05bbd110f2..3535081b713 100644 --- a/srcpkgs/pahole/template +++ b/srcpkgs/pahole/template @@ -1,8 +1,8 @@ # Template file for 'pahole' pkgname=pahole -version=1.15 +version=1.16 revision=1 -_bpfver=0.0.3 +_bpfver=0.0.6 build_style=cmake configure_args="-D__LIB=lib" makedepends="elfutils-devel zlib-devel" @@ -12,8 +12,8 @@ license="GPL-2.0-only" homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary" distfiles="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz https://github.com/libbpf/libbpf/archive/v${_bpfver}.tar.gz" -checksum="a84e183a0ef652e4198a161a20d9eeb45d3c153f5208e1cea833e1f28ae6207d - 972da73f4774be062a112fc0c9ebb5d238b775ed4512df5ce2cf20c8333929d3" +checksum="a8d013fb82490b03481754a75a26336c093ee69d3b8da1c350ab0bb12102ddca + dbed8304077699fd59b0271545ac5923a6e0581db4ef90d6124efa6fe9df84c1" case $XBPS_TARGET_MACHINE in *-musl) makedepends+=" musl-obstack argp-standalone"