diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index cd6f48a207..f8b7de9e41 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="procps-ng" -PKG_VERSION="3.3.17" -PKG_SHA256="8374d281f91e5fc9bb9ea8dc991b25331e3a2b0299b46f22c633f7fb6bcb0764" +PKG_VERSION="4.0.4" +PKG_SHA256="08dbaaaae6afe8d5fbeee8aa3f8b460b01c5e09ce4706b161846f067103a2cf2" PKG_LICENSE="GPL" PKG_SITE="https://gitlab.com/procps-ng/procps" PKG_URL="https://gitlab.com/procps-ng/procps/-/archive/v${PKG_VERSION}/procps-v${PKG_VERSION}.tar.bz2" @@ -18,14 +18,18 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-modern-top \ --enable-static" -PKG_MAKE_OPTS_TARGET="free top/top proc/libprocps.la proc/libprocps.pc" +PKG_MAKE_OPTS_TARGET="src/free src/top/top library/libproc2.la library/libproc2.pc" -PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA install-proc_libprocps_la_includeHEADERS" +PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA install-library_libproc2_la_includeHEADERS" makeinstall_target() { mkdir -p ${INSTALL}/usr/bin - cp -P ${PKG_BUILD}/.${TARGET_NAME}/free ${INSTALL}/usr/bin - cp -P ${PKG_BUILD}/.${TARGET_NAME}/top/top ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/free ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/top/top ${INSTALL}/usr/bin make DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET} + + sed 's@proc/misc.h@procps/misc.h@' \ + ${PKG_BUILD}/library/include/readproc.h \ + > ${SYSROOT_PREFIX}/usr/include/libproc2/readproc.h }