From: Josef Schlehofer Date: Sun, 15 Jun 2025 06:37:32 +0000 (+0200) Subject: treewide: drop anything related to uClibc X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3aab1ef31378219eb369147b2cc99b8c1be47dc1;p=feed%2Fpackages.git treewide: drop anything related to uClibc uClibc-ng was removed in 2020 from OpenWrt main repo [1]. These things are leftovers. [1] https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=63fb175203bbf3b336804587c2f5b3a2d8132ec1 Signed-off-by: Josef Schlehofer --- diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index df07c8cb1f..9db0e76060 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -121,15 +121,6 @@ PGSQL_CONFIG_VARS:= \ ac_cv_file__dev_urandom="/dev/urandom" \ ZIC=zic -ifeq ($(CONFIG_USE_UCLIBC),y) -# PostgreSQL does not build against uClibc with locales -# enabled, due to an uClibc bug, see -# http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html -# so overwrite automatic detection and disable locale support -PGSQL_CONFIG_VARS+= \ - pgac_cv_type_locale_t=no -endif - TARGET_CONFIGURE_OPTS+=$(PGSQL_CONFIG_VARS) HOST_CONFIGURE_ARGS += \ diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index eb47f9230e..021e377a79 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -68,16 +68,11 @@ define Package/haproxy-nossl/description This package is built without SSL support. endef -TARGET=linux-glibc +TARGET=linux-musl ENABLE_LUA:=y -ifeq ($(CONFIG_USE_UCLIBC),y) - ADDON+=USE_BACKTRACE= - ADDON+=USE_LIBCRYPT= -endif - -ifeq ($(CONFIG_USE_MUSL),y) - TARGET=linux-musl +ifeq ($(CONFIG_USE_GLIBC),y) + TARGET=linux-glibc endif ifeq ($(BUILD_VARIANT),ssl) diff --git a/net/linknx/Makefile b/net/linknx/Makefile index 0beab1b305..f99e8e3878 100644 --- a/net/linknx/Makefile +++ b/net/linknx/Makefile @@ -19,7 +19,7 @@ PKG_MAINTAINER:=Othmar Truniger PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone +PKG_BUILD_DEPENDS:=USE_MUSL:argp-standalone PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk diff --git a/net/netifyd/Makefile b/net/netifyd/Makefile index a09cae3d46..a0ffd2261f 100644 --- a/net/netifyd/Makefile +++ b/net/netifyd/Makefile @@ -32,7 +32,7 @@ define Package/netifyd CATEGORY:=Network TITLE:=Netify Agent URL:=http://www.netify.ai/ - DEPENDS:=+ca-bundle +libatomic +libcurl +libmnl +libnetfilter-conntrack +libpcap +zlib +libpthread @!USE_UCLIBC + DEPENDS:=+ca-bundle +libatomic +libcurl +libmnl +libnetfilter-conntrack +libpcap +zlib +libpthread # Explicitly depend on libstdcpp rather than $(CXX_DEPENDS). At the moment # std::unordered_map is only available via libstdcpp which is required for # performance reasons. diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile index b0bcbedb14..cd49d44fe9 100644 --- a/net/torsocks/Makefile +++ b/net/torsocks/Makefile @@ -39,13 +39,6 @@ define Package/torsocks/description It ensures that DNS requests are handled safely and explicitly rejects any traffic other than TCP from the application you're using. endef -define Build/Configure - $(call Build/Configure/Default) -ifeq ($(CONFIG_USE_UCLIBC),y) - find $(PKG_BUILD_DIR) -name 'Makefile' -exec sed -i 's|--param ssp-buffer-size=1 -fstack-protector-all||' \{\} \+ -endif -endef - define Package/conffiles /etc/tor/torsocks.conf endef