diff --git a/package/azmq/Config.in b/package/azmq/Config.in index 7bdd07ebf820..75cbeabf53eb 100644 --- a/package/azmq/Config.in +++ b/package/azmq/Config.in @@ -12,7 +12,6 @@ config BR2_PACKAGE_AZMQ select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_RANDOM - select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD help This library provides Boost Asio style bindings for ZeroMQ. diff --git a/package/azmq/azmq.mk b/package/azmq/azmq.mk index 99fb3212dfb5..bb918bd529d3 100644 --- a/package/azmq/azmq.mk +++ b/package/azmq/azmq.mk @@ -15,6 +15,6 @@ AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0 AZMQ_INSTALL_STAGING = YES AZMQ_INSTALL_TARGET = NO -AZMQ_CONF_OPTS = -DAZMQ_NO_TESTS=ON +AZMQ_CONF_OPTS = -DAZMQ_BUILD_TESTS=OFF $(eval $(cmake-package)) diff --git a/package/dash/Config.in b/package/dash/Config.in index b816ac7837b5..3573a40aa38b 100644 --- a/package/dash/Config.in +++ b/package/dash/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_DASH bool "dash" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on BR2_USE_WCHAR help DASH is a POSIX-compliant implementation of /bin/sh that aims to be as small as possible. It does this without @@ -10,3 +11,8 @@ config BR2_PACKAGE_DASH for most tasks. http://gondor.apana.org.au/~herbert/dash + +comment "dash needs a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on !BR2_USE_WCHAR diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk index 2f17a04efcec..3e41cb3b13a3 100644 --- a/package/llvm-project/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -109,6 +109,10 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all +# host-python3 is a permanent dependency of clang, so we can build the +# python bindings unconditionally: +HOST_CLANG_CONF_OPTS += -DCLANG_PYTHON_BINDINGS_VERSIONS=$(PYTHON3_VERSION_MAJOR) + # Help host-clang to find our external toolchain, use a relative path from the clang # installation directory to the external toolchain installation directory in order to # not hardcode the toolchain absolute path. diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 580235eecaac..80de6f3b2c98 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,4 +1,4 @@ -# From https://mupdf.com/downloads/index.html: +# From https://mupdf.com/releases: sha1 d79600bccd70ab9d0e8ee19dae4e275f2af95ced mupdf-1.23.9-source.tar.lz # Locally computed: diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 57501ab9546a..fe4f3e675621 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -68,7 +68,7 @@ endef define MUPDF_INSTALL_TARGET_CMDS $(MUPDF_MAKE_ENV) $(MAKE) -C $(@D) $(MUPDF_MAKE_OPTS) \ - DESTDIR="$(TARGET_DIR)" install + DESTDIR="$(TARGET_DIR)" install-libs install-apps endef $(eval $(generic-package)) diff --git a/package/squeezelite/0001-ir.c-fix-build-with-gcc-15.patch b/package/squeezelite/0001-ir.c-fix-build-with-gcc-15.patch new file mode 100644 index 000000000000..4fe61e25c05f --- /dev/null +++ b/package/squeezelite/0001-ir.c-fix-build-with-gcc-15.patch @@ -0,0 +1,44 @@ +From 787961d52130bd3c6c18b19218219650786e5352 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 6 Dec 2025 12:25:08 +0100 +Subject: [PATCH] ir.c: fix build with gcc-15 + +ir.c: In function 'ir_init': +ir.c:273:48: error: passing argument 3 of 'pthread_create' from incompatible pointer type [-Wincompatible-pointer-types] + 273 | pthread_create(&thread, &attr, ir_thread, NULL); + | ^~~~~~~~~ + | | + | void * (*)(void) +In file included from squeezelite.h:300, + from ir.c:36: +/home/buildroot/br/output/per-package/squeezelite/host/lib/gcc/x86_64-buildroot-linux-gnu/15.2.0/include-fixed/pthread.h:213:36: + note: expected 'void * (*)(void *)' but argument is of type 'void * (*)(void)' + 213 | void *(*__start_routine) (void *), + | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ +ir.c:169:14: note: 'ir_thread' declared here + 169 | static void *ir_thread() { + | ^~~~~~~~~ + +Upstream: https://github.com/ralph-irving/squeezelite/commit/1e8fb181366467b6c4046119eedb821e4a5f9adb + +Signed-off-by: Bernd Kuhls +--- + ir.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ir.c b/ir.c +index 84294b6..aeea23c 100644 +--- a/ir.c ++++ b/ir.c +@@ -166,7 +166,7 @@ static u32_t ir_key_map(const char *c, const char *r) { + return 0; + } + +-static void *ir_thread() { ++static void *ir_thread(void *vargp) { + char *code; + + while (fd > 0 && LIRC(i, nextcode, &code) == 0) { +-- +2.47.3 + diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index e1cf12fa68de..69eb73510e3b 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -449,6 +449,14 @@ define UCLIBC_INSTALL_UTILS_TARGET PREFIX=$(TARGET_DIR) \ utils install_utils endef + +define UCLIBC_INSTALL_UTILS_STAGING + $(MAKE1) -C $(@D) \ + CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \ + ARCH="$(UCLIBC_TARGET_ARCH)" \ + PREFIX=$(STAGING_DIR) \ + utils install_utils +endef endif define UCLIBC_INSTALL_TARGET_CMDS @@ -463,7 +471,7 @@ endef # STATIC has no ld* tools, only getconf ifeq ($(BR2_STATIC_LIBS),) -define UCLIBC_INSTALL_UTILS_STAGING +define UCLIBC_INSTALL_HOST_UTILS $(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/bin/ldd ln -sf ldd $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-ldd $(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/bin/ldconfig @@ -478,6 +486,7 @@ define UCLIBC_INSTALL_STAGING_CMDS DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ install_runtime install_dev + $(UCLIBC_INSTALL_HOST_UTILS) $(UCLIBC_INSTALL_UTILS_STAGING) endef diff --git a/system/Config.in b/system/Config.in index 98bbd9309243..8f2dde59e7f2 100644 --- a/system/Config.in +++ b/system/Config.in @@ -399,7 +399,7 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD choice bool "/bin/sh" - default BR2_SYSTEM_BIN_SH_DASH if !BR2_PACKAGE_BUSYBOX + default BR2_SYSTEM_BIN_SH_BASH if !BR2_PACKAGE_BUSYBOX help Select which shell will provide /bin/sh. @@ -418,6 +418,7 @@ config BR2_SYSTEM_BIN_SH_DASH bool "dash" depends on BR2_USE_MMU # dash depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on BR2_USE_WCHAR # dash select BR2_PACKAGE_DASH config BR2_SYSTEM_BIN_SH_MKSH