Browse Source

stress-ng: remove libaio and libbsd support

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 4 years ago
parent
commit
253ca66efc
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
2 changed files with 66 additions and 1 deletions
  1. +1
    -1
      utils/stress-ng/Makefile
  2. +65
    -0
      utils/stress-ng/patches/020-no-bsd-aio.patch

+ 1
- 1
utils/stress-ng/Makefile View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=stress-ng PKG_NAME:=stress-ng
PKG_VERSION:=0.11.18 PKG_VERSION:=0.11.18
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://kernel.ubuntu.com/~cking/tarballs/stress-ng PKG_SOURCE_URL:=https://kernel.ubuntu.com/~cking/tarballs/stress-ng


+ 65
- 0
utils/stress-ng/patches/020-no-bsd-aio.patch View File

@ -0,0 +1,65 @@
--- a/Makefile.config
+++ b/Makefile.config
@@ -67,7 +67,7 @@ ifeq ($(shell uname -s),SunOS)
endif
ifndef $(HAVE_LIB_AIO)
-HAVE_LIB_AIO = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_AIO) TEST_PROG=test-libaio have_test_prog)
+#HAVE_LIB_AIO = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_AIO) TEST_PROG=test-libaio have_test_prog)
ifeq ($(HAVE_LIB_AIO),1)
CONFIG_CFLAGS += -DHAVE_LIB_AIO
CONFIG_LDFLAGS += $(LIB_AIO)
@@ -76,7 +76,7 @@ endif
endif
ifndef $(HAVE_LIB_BSD)
-HAVE_LIB_BSD = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-libbsd have_test_prog)
+#HAVE_LIB_BSD = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-libbsd have_test_prog)
ifeq ($(HAVE_LIB_BSD),1)
CONFIG_CFLAGS += -DHAVE_LIB_BSD
CONFIG_LDFLAGS += $(LIB_BSD)
@@ -103,7 +103,7 @@ endif
endif
ifndef $(HAVE_LIB_SCTP)
-HAVE_LIB_SCTP = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_SCTP) TEST_PROG=test-libsctp have_test_prog)
+#HAVE_LIB_SCTP = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_SCTP) TEST_PROG=test-libsctp have_test_prog)
ifeq ($(HAVE_LIB_SCTP),1)
CONFIG_CFLAGS += -DHAVE_LIB_SCTP
CONFIG_LDFLAGS += $(LIB_SCTP)
@@ -178,7 +178,7 @@ endif
endif
ifndef $(HAVE_AIO_H)
-HAVE_AIO_H = $(shell $(MAKE) $(MAKE_OPTS) HEADER=aio.h have_header_h)
+#HAVE_AIO_H = $(shell $(MAKE) $(MAKE_OPTS) HEADER=aio.h have_header_h)
ifeq ($(HAVE_AIO_H),1)
CONFIG_CFLAGS += -DHAVE_AIO_H
$(info autoconfig: using aio.h)
@@ -2516,7 +2516,7 @@ endif
endif
ifndef $(HAVE_SETPROCTITLE)
-HAVE_SETPROCTITLE = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-setproctitle have_test_prog)
+#HAVE_SETPROCTITLE = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-setproctitle have_test_prog)
ifeq ($(HAVE_SETPROCTITLE),1)
CONFIG_CFLAGS += -DHAVE_SETPROCTITLE
$(info autoconfig: using setproctitle)
@@ -3140,7 +3140,7 @@ endif
ifndef $(HAVE_WCSLCAT)
WCSFUNC=wcslcat
export WCSFUNC
-HAVE_WCSLCAT = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcat have_wcsfunc)
+#HAVE_WCSLCAT = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcat have_wcsfunc)
ifeq ($(HAVE_WCSLCAT),1)
CONFIG_CFLAGS += -DHAVE_WCSLCAT
$(info autoconfig: using wcslcat)
@@ -3150,7 +3150,7 @@ endif
ifndef $(HAVE_WCSLCPY)
WCSFUNC=wcslcpy
export WCSFUNC
-HAVE_WCSLCPY = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcpy have_wcsfunc)
+#HAVE_WCSLCPY = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcpy have_wcsfunc)
ifeq ($(HAVE_WCSLCPY),1)
CONFIG_CFLAGS += -DHAVE_WCSLCPY
$(info autoconfig: using wcslcpy)

Loading…
Cancel
Save