diff --git a/Config.in.legacy b/Config.in.legacy index f53fb149bf..85c6a68527 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.11.1" +config BR2_PACKAGE_LIBDNET_PYTHON + bool "libdnet python module removed" + select BR2_LEGACY + help + The libdnet Python module is no longer compatible with + Python >= 3.13, so it had to be removed. + config BR2_PACKAGE_OPENCV3_WITH_FFMPEG bool "opencv3 ffmpeg support removed" select BR2_LEGACY diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in index 473e8aea22..9fd6a85c36 100644 --- a/package/libdnet/Config.in +++ b/package/libdnet/Config.in @@ -5,27 +5,3 @@ config BR2_PACKAGE_LIBDNET routines. http://libdnet.sourceforge.net/ - -if BR2_PACKAGE_LIBDNET - -config BR2_PACKAGE_LIBDNET_PYTHON - bool "libdnet python module" - depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_STATIC_LIBS # libbsd - depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd - depends on BR2_USE_WCHAR # libbsd - select BR2_PACKAGE_LIBBSD - help - dnet module for python - -comment "dnet module for python requires python3 package" - depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_PACKAGE_PYTHON3 - -comment "dnet module for python needs a toolchain w/ dynamic library, threads, wchar" - depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR - -endif diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index 8eebd1050d..12491a93bf 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -12,18 +12,11 @@ LIBDNET_INSTALL_STAGING = YES LIBDNET_AUTORECONF = YES LIBDNET_CONF_OPTS = \ --with-gnu-ld \ - --with-check=no + --with-check=no \ + --without-python LIBDNET_CONFIG_SCRIPTS = dnet-config LIBDNET_DEPENDENCIES = host-pkgconf -ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 -LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin -LIBDNET_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) -LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec -LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -endif - # Needed for autoreconf to work properly define LIBDNET_FIXUP_ACINCLUDE_M4 ln -sf config/acinclude.m4 $(@D)