diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-12-18 17:32:46 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-12-29 18:50:24 +0100 |
commit | f12bad6c19df4ad10b274e0c1e10bcdaaccf96f3 (patch) | |
tree | ce8490f316730c7fcd4acc46c172eb5d9b3c4636 | |
parent | 3195a992d6f635ad82dbe39ee584571371334450 (diff) | |
download | openwrt-f12bad6c19df4ad10b274e0c1e10bcdaaccf96f3.tar.gz openwrt-f12bad6c19df4ad10b274e0c1e10bcdaaccf96f3.tar.bz2 openwrt-f12bad6c19df4ad10b274e0c1e10bcdaaccf96f3.zip |
tree-wide: Do not use package librt and libpthread
The libraries libpthread, libdl, libutil, libanl have been integrated
into the libc library in version 2.34. it is not needed to explicitly
link them any more.
Most of the functions have been moved from the librt.so into libc.so
some time ago already.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r-- | include/package-defaults.mk | 2 | ||||
-rw-r--r-- | package/network/services/hostapd/Makefile | 5 | ||||
-rw-r--r-- | package/system/fstools/Makefile | 3 | ||||
-rw-r--r-- | package/system/procd/Makefile | 3 | ||||
-rw-r--r-- | package/system/ubox/Makefile | 6 | ||||
-rw-r--r-- | package/utils/e2fsprogs/Makefile | 1 | ||||
-rw-r--r-- | package/utils/lua/Makefile | 2 |
7 files changed, 6 insertions, 16 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 3ee3a965f2..72f88b9bbb 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -2,7 +2,7 @@ # # Copyright (C) 2006-2020 OpenWrt.org -PKG_DEFAULT_DEPENDS = +libc +USE_GLIBC:librt +USE_GLIBC:libpthread +PKG_DEFAULT_DEPENDS = +libc ifneq ($(PKG_NAME),toolchain) PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2))) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 829879f763..7daca315b0 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -139,11 +139,6 @@ ifneq ($(LOCAL_TYPE),hostapd) endif endif -ifdef CONFIG_USE_GLIBC - TARGET_LDFLAGS += -lrt - TARGET_LDFLAGS_C += -lrt -endif - DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index f7cb17461c..f716f26c05 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -31,7 +31,6 @@ PKG_MAINTAINER:=John Crispin <john@phrozen.org> include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y) CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_OVL_MOUNT_FULL_ACCESS_TIME),-DCMAKE_OVL_MOUNT_FULL_ACCESS_TIME=y) CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_OVL_MOUNT_COMPRESS_ZLIB),-DCMAKE_OVL_MOUNT_COMPRESS_ZLIB=y) @@ -39,7 +38,7 @@ CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_OVL_MOUNT_COMPRESS_ZLIB),-DCMAKE_OVL_MOUN define Package/fstools SECTION:=base CATEGORY:=Base system - DEPENDS:=+ubox +USE_GLIBC:librt +NAND_SUPPORT:ubi-utils + DEPENDS:=+ubox +NAND_SUPPORT:ubi-utils TITLE:=OpenWrt filesystem tools MENU:=1 endef diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 5e9733675a..2eebe50a4f 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -35,7 +35,6 @@ ifeq ($(DUMP),) endif CMAKE_OPTIONS += -DEARLY_PATH="$(TARGET_INIT_PATH)" -TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) TARGET_CFLAGS += -flto TARGET_LDFLAGS += -flto @@ -43,7 +42,7 @@ TARGET_LDFLAGS += -flto define Package/procd/Default SECTION:=base CATEGORY:=Base system - DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox \ + DEPENDS:=+ubusd +ubus +libjson-script +ubox +libubox \ +libubus +libblobmsg-json +libjson-c +jshn TITLE:=OpenWrt system process manager USERID:=:dialout=20 :audio=29 diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index ca177b2c49..1030c14bb1 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -18,12 +18,10 @@ PKG_MAINTAINER:=John Crispin <john@phrozen.org> include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) - define Package/ubox SECTION:=base CATEGORY:=Base system - DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt + DEPENDS:=+libubox +ubusd +ubus +libubus +libuci TITLE:=OpenWrt system helper toolbox ALTERNATIVES:=\ 100:/sbin/rmmod:/sbin/kmodloader \ @@ -46,7 +44,7 @@ endef define Package/logd SECTION:=base CATEGORY:=Base system - DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt + DEPENDS:=+libubox +libubus +libblobmsg-json TITLE:=OpenWrt system log implementation USERID:=logd=514:logd=514 endef diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 2ece58f315..94f22a53cc 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -144,7 +144,6 @@ endef TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) TARGET_LDFLAGS += -flto CONFIGURE_ARGS += \ diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile index 9d7cc40671..e4d2fd1c50 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua/Makefile @@ -99,7 +99,7 @@ define Build/Compile RANLIB="$(TARGET_CROSS)ranlib" \ INSTALL_ROOT=/usr \ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ - MYLDFLAGS="$(TARGET_LDFLAGS) $(if $(CONFIG_USE_GLIBC),-lm -ldl)" \ + MYLDFLAGS="$(TARGET_LDFLAGS)" \ PKG_VERSION=$(PKG_VERSION) \ linux rm -rf $(PKG_INSTALL_DIR) |