8 files changed, 49 insertions, 25 deletions
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index 42812796d..e4391eddd 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -15,12 +15,15 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxkbfile-install:
 	${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
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
diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile
index 03da06b23..fd8f421cd 100644
--- a/package/xkbcomp/Makefile
+++ b/package/xkbcomp/Makefile
@@ -11,16 +11,20 @@ PKG_DESCR:=		x11 keyboard compiler
 PKG_SECTION:=		x11/misc
 PKG_BUILDDEP:=		libxkbfile libX11
 PKG_DEPENDS:=		libxkbfile libx11
+HOST_BUILDDEP:=		libxkbfile-host
 PKG_SITES:=		http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 xkbcomp-install:
 	${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index 182812e57..27551639b 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c
 PKG_DESCR:=		keyboard config
 PKG_SECTION:=		x11/misc
-PKG_BUILDDEP:=		util-macros-host xkbcomp meson-host
+PKG_BUILDDEP:=		util-macros-host xkbcomp-host xkbcomp meson-host
 PKG_SITES:=		http://www.x.org/releases/individual/data/xkeyboard-config/
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/scripts/prereq.sh b/scripts/prereq.sh
index aed832da4..7faee35ae 100755
--- a/scripts/prereq.sh
+++ b/scripts/prereq.sh
@@ -771,10 +771,6 @@ else
     NEED_STATIC_LIBSTDCXX="$NEED_STATIC_LIBSTDCXX icu4c"
   fi
 
-  if [ -n "$ADK_PACKAGE_XKEYBOARD_CONFIG" ]; then
-    NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
-  fi
-
   if [ -n "$ADK_PACKAGE_FONT_BH_100DPI" ]; then
     NEED_MKFONTDIR="$NEED_MKFONTDIR font-bh-100dpi"
   fi
@@ -845,13 +841,6 @@ else
     fi
   fi
 
-  if [ -n "$NEED_XKBCOMP" ]; then
-    if ! which xkbcomp >/dev/null 2>&1; then
-      printf "You need xkbcomp to build $NEED_XKBCOMP \n"
-      out=1
-    fi
-  fi
-
   if [ -n "$NEED_JAVA" ]; then
     if ! which java >/dev/null 2>&1; then
       printf "You need java to build $NEED_JAVA \n"
diff --git a/target/riscv32/uclibc-ng.config b/target/riscv32/uclibc-ng.config
index 63047370c..adb0a1de7 100644
--- a/target/riscv32/uclibc-ng.config
+++ b/target/riscv32/uclibc-ng.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.45 C Library Configuration
+# uClibc-ng 1.0.52 C Library Configuration
 #
 # TARGET_aarch64 is not set
 # TARGET_alpha is not set
@@ -58,6 +58,7 @@ UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
 DO_XSI_MATH=y
+UCLIBC_HAS_FENV=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS=""
 HAVE_DOT_CONFIG=y
@@ -66,6 +67,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+# STATIC_PIE is not set
 HAVE_LDSO=y
 HAVE_SHARED=y
 # FORCE_SHAREABLE_TEXT_SEGMENTS is not set
@@ -85,6 +87,7 @@ LDSO_LD_LIBRARY_PATH=y
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
+# UCLIBC_HAS_LINUXTHREADS is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
diff --git a/target/riscv64/uclibc-ng.config b/target/riscv64/uclibc-ng.config
index a0f4ee9fc..16d2849e8 100644
--- a/target/riscv64/uclibc-ng.config
+++ b/target/riscv64/uclibc-ng.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.46 C Library Configuration
+# uClibc-ng 1.0.52 C Library Configuration
 #
 # TARGET_aarch64 is not set
 # TARGET_alpha is not set
@@ -35,7 +35,7 @@ TARGET_riscv64=y
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 TARGET_LDSO_NAME="ld-uClibc"
-TARGET_ARCH_BITS=32
+TARGET_ARCH_BITS=64
 
 #
 # Target Architecture Features and Options
@@ -58,6 +58,7 @@ UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
 DO_XSI_MATH=y
+UCLIBC_HAS_FENV=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS=""
 HAVE_DOT_CONFIG=y
@@ -86,6 +87,7 @@ LDSO_LD_LIBRARY_PATH=y
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
+# UCLIBC_HAS_LINUXTHREADS is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y