packages: some (e)glibc fixes after r44701

Signed-off-by: Nicolas Thill <nico@openwrt.org>

SVN-Revision: 44842
This commit is contained in:
Nicolas Thill 2015-03-16 12:25:06 +00:00
parent 81e51681e7
commit 4b382a440b
11 changed files with 15 additions and 17 deletions

View file

@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/perf define Package/perf
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
DEPENDS:= @USE_EGLIBC +libelf1 +libdw +libpthread +librt +binutils DEPENDS:= @USE_GLIBC +libelf1 +libdw +libpthread +librt +binutils
TITLE:=Linux performance monitoring tool TITLE:=Linux performance monitoring tool
VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
URL:=http://www.kernel.org URL:=http://www.kernel.org

View file

@ -18,7 +18,7 @@ PKG_INSTALL:=1
define Package/libbsd define Package/libbsd
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=@USE_EGLIBC DEPENDS:=@USE_GLIBC
TITLE:=common BSD library TITLE:=common BSD library
endef endef

View file

@ -89,7 +89,7 @@ ifneq ($(LOCAL_TYPE),hostapd)
CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch) CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
endif endif
ifdef CONFIG_USE_EGLIBC ifdef CONFIG_USE_GLIBC
TARGET_LDFLAGS += -lrt TARGET_LDFLAGS += -lrt
TARGET_LDFLAGS_C += -lrt TARGET_LDFLAGS_C += -lrt
endif endif

View file

@ -25,7 +25,7 @@ define Package/igmpproxy
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Routing and Redirection SUBMENU:=Routing and Redirection
DEPENDS:=+USE_EGLIBC:librt DEPENDS:=+USE_GLIBC:librt
TITLE:=Multicast Routing Daemon TITLE:=Multicast Routing Daemon
URL:=http://sourceforge.net/projects/igmpproxy URL:=http://sourceforge.net/projects/igmpproxy
endef endef

View file

@ -31,7 +31,7 @@ define Package/lldpd
SUBMENU:=Routing and Redirection SUBMENU:=Routing and Redirection
TITLE:=Link Layer Discovery Protocol daemon TITLE:=Link Layer Discovery Protocol daemon
URL:=https://github.com/vincentbernat/lldpd/wiki URL:=https://github.com/vincentbernat/lldpd/wiki
DEPENDS:=+libevent2 +USE_EGLIBC:libbsd +LLDPD_WITH_JSON:libjson-c DEPENDS:=+libevent2 +USE_GLIBC:libbsd +LLDPD_WITH_JSON:libjson-c
USERID:=lldp=121:lldp=129 USERID:=lldp=121:lldp=129
MENU:=1 MENU:=1
endef endef

View file

@ -35,7 +35,7 @@ define Package/samba36-server
CATEGORY:=Network CATEGORY:=Network
TITLE:=Samba 3.6 SMB/CIFS server TITLE:=Samba 3.6 SMB/CIFS server
URL:=http://www.samba.org/ URL:=http://www.samba.org/
DEPENDS:=+USE_EGLIBC:librt DEPENDS:=+USE_GLIBC:librt
endef endef
define Package/samba36-client define Package/samba36-client

View file

@ -82,10 +82,8 @@ define Build/Configure
> $(PKG_BUILD_DIR)/include/SNAPSHOT.h > $(PKG_BUILD_DIR)/include/SNAPSHOT.h
endef endef
ifdef CONFIG_USE_EGLIBC ifdef CONFIG_USE_GLIBC
ifndef CONFIG_EGLIBC_VERSION_2_13 TARGET_CFLAGS += -DHAVE_SETNS
TARGET_CFLAGS += -DHAVE_SETNS
endif
endif endif
ifdef CONFIG_USE_MUSL ifdef CONFIG_USE_MUSL
TARGET_CFLAGS += -DHAVE_SETNS TARGET_CFLAGS += -DHAVE_SETNS

View file

@ -68,7 +68,7 @@ endef
define Package/iputils-ping6 define Package/iputils-ping6
$(call Package/iputils/Default) $(call Package/iputils/Default)
TITLE:=iputils - ping6 TITLE:=iputils - ping6
DEPENDS+= @IPV6 +USE_EGLIBC:libopenssl DEPENDS+= @IPV6 +USE_GLIBC:libopenssl
endef endef
define Package/iputils-ping6/description define Package/iputils-ping6/description

View file

@ -30,13 +30,13 @@ PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt) TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y) CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y)
define Package/fstools define Package/fstools
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+ubox +USE_EGLIBC:librt +NAND_SUPPORT:ubi-utils DEPENDS:=+ubox +USE_GLIBC:librt +NAND_SUPPORT:ubi-utils
TITLE:=OpenWrt filesystem tools TITLE:=OpenWrt filesystem tools
MENU:=1 MENU:=1
endef endef

View file

@ -27,12 +27,12 @@ PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt) TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
define Package/procd define Package/procd
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_EGLIBC:librt +libubox +libubus +NAND_SUPPORT:procd-nand DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox +libubus +NAND_SUPPORT:procd-nand
TITLE:=OpenWrt system process manager TITLE:=OpenWrt system process manager
endef endef

View file

@ -20,12 +20,12 @@ PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt) TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
define Package/ubox define Package/ubox
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_EGLIBC:librt DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt
TITLE:=OpenWrt system helper toolbox TITLE:=OpenWrt system helper toolbox
endef endef