diff options
| -rw-r--r-- | package/stress-ng/Makefile | 18 | ||||
| -rw-r--r-- | package/stress-ng/patches/patch-Makefile | 25 |
2 files changed, 33 insertions, 10 deletions
diff --git a/package/stress-ng/Makefile b/package/stress-ng/Makefile index d9758801c..607cb922c 100644 --- a/package/stress-ng/Makefile +++ b/package/stress-ng/Makefile @@ -4,16 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= stress-ng -PKG_VERSION:= 0.07.29 +PKG_VERSION:= 0.18.12 PKG_RELEASE:= 1 -PKG_HASH:= 71a9555d1d9ee0a4a9bca9ee14294289ee77e998a951c7071df6cc8e153d8410 -PKG_DESCR:= stress-ng will stress test a computer system in various selectable ways +PKG_HASH:= 20401a5a52a3b3b5d84fbdd561e4daf1076b0368a1ccbbbc8d41af2be6ea6f34 +PKG_DESCR:= stress test a computer system in various selectable ways PKG_SECTION:= sys/utils -PKG_SITES:= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/ +PKG_SITES:= https://github.com/ColinIanKing/stress-ng/archive/refs/tags/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_CFLINE_STRESS_NG:= depends on ADK_BROKEN +DISTFILES:= V${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/package.mk @@ -22,12 +20,12 @@ $(eval $(call PKG_template,STRESS_NG,stress-ng,${PKG_VERSION}-${PKG_RELEASE},${P CONFIG_STYLE:= manual BUILD_STYLE:= manual +do-build: + PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} stress-ng + stress-ng-install: ${INSTALL_DIR} ${IDIR_STRESS_NG}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/stress-ng ${IDIR_STRESS_NG}/usr/bin/ -do-build: - PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} stress-ng - include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/stress-ng/patches/patch-Makefile b/package/stress-ng/patches/patch-Makefile new file mode 100644 index 000000000..2548f682c --- /dev/null +++ b/package/stress-ng/patches/patch-Makefile @@ -0,0 +1,25 @@ +--- stress-ng-0.18.12.orig/Makefile 2025-03-30 14:58:32.000000000 +0200 ++++ stress-ng-0.18.12/Makefile 2025-04-24 12:52:34.277715554 +0200 +@@ -127,22 +127,6 @@ SANITIZE_FLAGS := \ + override CFLAGS += $(foreach flag,$(SANITIZE_FLAGS),$(cc_supports_flag)) + endif + +-# +-# Test for hardening flags and apply them if applicable +-# +-MACHINE := $(shell make -f Makefile.machine) +-ifneq ($(PRESERVE_CFLAGS),1) +-ifneq ($(MACHINE),$(filter $(MACHINE),alpha hppa ia64)) +-flag = -Wformat -fstack-protector-strong -Werror=format-security +-# +-# add -D_FORTIFY_SOURCE=2 if _FORTIFY_SOURCE is not already defined +-# +-ifeq ($(shell echo _FORTIFY_SOURCE | $(CC) $(CFLAGS) -E -xc - | tail -1),_FORTIFY_SOURCE) +-flag += -D_FORTIFY_SOURCE=2 +-endif +-override CFLAGS += $(cc_supports_flag) +-endif +-endif + + # + # Optimization flags |