Author: nico Date: 2015-03-16 13:25:06 +0100 (Mon, 16 Mar 2015) New Revision: 44842
Modified: trunk/package/devel/perf/Makefile trunk/package/libs/libbsd/Makefile trunk/package/network/services/hostapd/Makefile trunk/package/network/services/igmpproxy/Makefile trunk/package/network/services/lldpd/Makefile trunk/package/network/services/samba36/Makefile trunk/package/network/utils/iproute2/Makefile trunk/package/network/utils/iputils/Makefile trunk/package/system/fstools/Makefile trunk/package/system/procd/Makefile trunk/package/system/ubox/Makefile Log: packages: some (e)glibc fixes after r44701 Signed-off-by: Nicolas Thill <[email protected]> Modified: trunk/package/devel/perf/Makefile =================================================================== --- trunk/package/devel/perf/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/devel/perf/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -19,7 +19,7 @@ define Package/perf SECTION:=devel CATEGORY:=Development - DEPENDS:= @USE_EGLIBC +libelf1 +libdw +libpthread +librt +binutils + DEPENDS:= @USE_GLIBC +libelf1 +libdw +libpthread +librt +binutils TITLE:=Linux performance monitoring tool VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) URL:=http://www.kernel.org Modified: trunk/package/libs/libbsd/Makefile =================================================================== --- trunk/package/libs/libbsd/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/libs/libbsd/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -18,7 +18,7 @@ define Package/libbsd SECTION:=libs CATEGORY:=Libraries - DEPENDS:=@USE_EGLIBC + DEPENDS:=@USE_GLIBC TITLE:=common BSD library endef Modified: trunk/package/network/services/hostapd/Makefile =================================================================== --- trunk/package/network/services/hostapd/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/network/services/hostapd/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -89,7 +89,7 @@ CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch) endif -ifdef CONFIG_USE_EGLIBC +ifdef CONFIG_USE_GLIBC TARGET_LDFLAGS += -lrt TARGET_LDFLAGS_C += -lrt endif Modified: trunk/package/network/services/igmpproxy/Makefile =================================================================== --- trunk/package/network/services/igmpproxy/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/network/services/igmpproxy/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -25,7 +25,7 @@ SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection - DEPENDS:=+USE_EGLIBC:librt + DEPENDS:=+USE_GLIBC:librt TITLE:=Multicast Routing Daemon URL:=http://sourceforge.net/projects/igmpproxy endef Modified: trunk/package/network/services/lldpd/Makefile =================================================================== --- trunk/package/network/services/lldpd/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/network/services/lldpd/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -31,7 +31,7 @@ SUBMENU:=Routing and Redirection TITLE:=Link Layer Discovery Protocol daemon 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 MENU:=1 endef Modified: trunk/package/network/services/samba36/Makefile =================================================================== --- trunk/package/network/services/samba36/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/network/services/samba36/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -35,7 +35,7 @@ CATEGORY:=Network TITLE:=Samba 3.6 SMB/CIFS server URL:=http://www.samba.org/ - DEPENDS:=+USE_EGLIBC:librt + DEPENDS:=+USE_GLIBC:librt endef define Package/samba36-client Modified: trunk/package/network/utils/iproute2/Makefile =================================================================== --- trunk/package/network/utils/iproute2/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/network/utils/iproute2/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -82,10 +82,8 @@ > $(PKG_BUILD_DIR)/include/SNAPSHOT.h endef -ifdef CONFIG_USE_EGLIBC - ifndef CONFIG_EGLIBC_VERSION_2_13 - TARGET_CFLAGS += -DHAVE_SETNS - endif +ifdef CONFIG_USE_GLIBC + TARGET_CFLAGS += -DHAVE_SETNS endif ifdef CONFIG_USE_MUSL TARGET_CFLAGS += -DHAVE_SETNS Modified: trunk/package/network/utils/iputils/Makefile =================================================================== --- trunk/package/network/utils/iputils/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/network/utils/iputils/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -68,7 +68,7 @@ define Package/iputils-ping6 $(call Package/iputils/Default) TITLE:=iputils - ping6 - DEPENDS+= @IPV6 +USE_EGLIBC:libopenssl + DEPENDS+= @IPV6 +USE_GLIBC:libopenssl endef define Package/iputils-ping6/description Modified: trunk/package/system/fstools/Makefile =================================================================== --- trunk/package/system/fstools/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/system/fstools/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -30,13 +30,13 @@ include $(INCLUDE_DIR)/package.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) define Package/fstools SECTION:=base 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 MENU:=1 endef Modified: trunk/package/system/procd/Makefile =================================================================== --- trunk/package/system/procd/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/system/procd/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -27,12 +27,12 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt) +TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) define Package/procd SECTION:=base 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 endef Modified: trunk/package/system/ubox/Makefile =================================================================== --- trunk/package/system/ubox/Makefile 2015-03-16 11:53:22 UTC (rev 44841) +++ trunk/package/system/ubox/Makefile 2015-03-16 12:25:06 UTC (rev 44842) @@ -20,12 +20,12 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt) +TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) define Package/ubox SECTION:=base 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 endef _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
