From 13da72d28c7bf275d7fba38342f0472b7cc015be Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 7 Feb 2013 17:34:53 +0000 Subject: toolchain/eglibc: add support for 2.17 Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35515 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/eglibc/Config.in | 5 +++++ toolchain/eglibc/Config.version | 1 + toolchain/eglibc/common.mk | 5 +++++ 3 files changed, 11 insertions(+) (limited to 'toolchain/eglibc') diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in index 2e3b73af7..11f9abe11 100644 --- a/toolchain/eglibc/Config.in +++ b/toolchain/eglibc/Config.in @@ -13,6 +13,10 @@ choice bool "eglibc 2.16" depends !GCC_VERSION_LLVM + config EGLIBC_VERSION_2_17 + bool "eglibc 2.17" + depends !GCC_VERSION_LLVM + endchoice config EGLIBC_REVISION @@ -20,6 +24,7 @@ config EGLIBC_REVISION depends on TOOLCHAINOPTS && USE_EGLIBC default "18909" if EGLIBC_VERSION_2_15 default "21110" if EGLIBC_VERSION_2_16 + default "22243" if EGLIBC_VERSION_2_17 default "" menu "eglibc configuration" diff --git a/toolchain/eglibc/Config.version b/toolchain/eglibc/Config.version index 496b90bf6..92ba3e6ee 100644 --- a/toolchain/eglibc/Config.version +++ b/toolchain/eglibc/Config.version @@ -3,4 +3,5 @@ config EGLIBC_VERSION depends on USE_EGLIBC default "2.15" if EGLIBC_VERSION_2_15 default "2.16" if EGLIBC_VERSION_2_16 + default "2.17" if EGLIBC_VERSION_2_17 default "2.15" diff --git a/toolchain/eglibc/common.mk b/toolchain/eglibc/common.mk index 5c8dc117e..483f57db8 100644 --- a/toolchain/eglibc/common.mk +++ b/toolchain/eglibc/common.mk @@ -21,6 +21,9 @@ endif ifneq ($(CONFIG_EGLIBC_VERSION_2_16),) PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_16 endif +ifneq ($(CONFIG_EGLIBC_VERSION_2_17),) + PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_17 +endif PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION) @@ -80,7 +83,9 @@ define Host/Prepare $(call Host/Prepare/Default) ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) $(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults +ifneq ($(CONFIG_EGLIBC_VERSION_2_17),y) ln -sf ../ports $(HOST_BUILD_DIR)/libc/ +endif endef define Host/Clean -- cgit v1.2.3 From f74aaaa3474d6d1b9d36411e5ec35ed671a90ad7 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 29 Mar 2013 13:16:09 +0000 Subject: toolchain/eglibc: add missing ld-search-paths patch to 2.17 this patch is a copy of trunk/toolchain/eglibc/patches/2.16/200-add-dl-search-paths.patch in trunk/toolchain/eglibc/patches/2.17/200-add-ld-search-paths.patch please use svn copy instead of applying it (like in https://dev.openwrt.org/changeset/34290/) the patch add /usr/lib in the ld search path (for eglibc 2.17), thus helping libs like libnl-tiny.so (for iw), libjson.so.0 (for ubus, jshn) to be found Signed-off-by: Etienne CHAMPETIER Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36141 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../eglibc/patches/2.17/200-add-dl-search-paths.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 toolchain/eglibc/patches/2.17/200-add-dl-search-paths.patch (limited to 'toolchain/eglibc') diff --git a/toolchain/eglibc/patches/2.17/200-add-dl-search-paths.patch b/toolchain/eglibc/patches/2.17/200-add-dl-search-paths.patch new file mode 100644 index 000000000..70e7e604d --- /dev/null +++ b/toolchain/eglibc/patches/2.17/200-add-dl-search-paths.patch @@ -0,0 +1,14 @@ +add /usr/lib to default search path for the dynamic linker + +--- a/libc/Makeconfig ++++ b/libc/Makeconfig +@@ -539,6 +539,9 @@ + default-rpath = $(libdir) + endif + ++# Add /usr/lib to default search path for the dynamic linker ++user-defined-trusted-dirs := /usr/lib ++ + ifndef link-extra-libs + link-extra-libs = $(LDLIBS-$(@F)) + link-extra-libs-static = $(link-extra-libs) -- cgit v1.2.3 From cac6e3495f74f87646f4d177eb2c978feb5d3fdd Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 17 Apr 2013 15:36:41 +0000 Subject: build: consistently use 'depends on' instead of 'depends' make the syntax more compatible with kernel menuconfig Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36351 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/eglibc/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolchain/eglibc') diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in index 11f9abe11..de5c5b429 100644 --- a/toolchain/eglibc/Config.in +++ b/toolchain/eglibc/Config.in @@ -7,15 +7,15 @@ choice config EGLIBC_VERSION_2_15 bool "eglibc 2.15" - depends !GCC_VERSION_LLVM + depends on !GCC_VERSION_LLVM config EGLIBC_VERSION_2_16 bool "eglibc 2.16" - depends !GCC_VERSION_LLVM + depends on !GCC_VERSION_LLVM config EGLIBC_VERSION_2_17 bool "eglibc 2.17" - depends !GCC_VERSION_LLVM + depends on !GCC_VERSION_LLVM endchoice -- cgit v1.2.3 From 16768cac5b7af0bf837de490af4b9831851c137b Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 18 Apr 2013 12:04:55 +0000 Subject: toolchain: get rid of eglibc version kconfig symbol overloading git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36358 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/eglibc/Config.in | 14 +++++++------- toolchain/eglibc/Config.version | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 9 deletions(-) (limited to 'toolchain/eglibc') diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in index de5c5b429..791033662 100644 --- a/toolchain/eglibc/Config.in +++ b/toolchain/eglibc/Config.in @@ -1,21 +1,21 @@ choice prompt "eglibc version" depends on TOOLCHAINOPTS && USE_EGLIBC - default EGLIBC_VERSION_2_15 + default EGLIBC_USE_VERSION_2_15 help Select the version of eglibc you wish to use. - config EGLIBC_VERSION_2_15 + config EGLIBC_USE_VERSION_2_15 bool "eglibc 2.15" - depends on !GCC_VERSION_LLVM + select EGLIBC_VERSION_2_15 - config EGLIBC_VERSION_2_16 + config EGLIBC_USE_VERSION_2_16 bool "eglibc 2.16" - depends on !GCC_VERSION_LLVM + select EGLIBC_VERSION_2_16 - config EGLIBC_VERSION_2_17 + config EGLIBC_USE_VERSION_2_17 bool "eglibc 2.17" - depends on !GCC_VERSION_LLVM + select EGLIBC_VERSION_2_17 endchoice diff --git a/toolchain/eglibc/Config.version b/toolchain/eglibc/Config.version index 92ba3e6ee..a383bb211 100644 --- a/toolchain/eglibc/Config.version +++ b/toolchain/eglibc/Config.version @@ -1,7 +1,19 @@ +if USE_EGLIBC + config EGLIBC_VERSION string - depends on USE_EGLIBC default "2.15" if EGLIBC_VERSION_2_15 default "2.16" if EGLIBC_VERSION_2_16 default "2.17" if EGLIBC_VERSION_2_17 - default "2.15" + +config EGLIBC_VERSION_2_15 + default y if !TOOLCHAINOPTS + bool + +config EGLIBC_VERSION_2_16 + bool + +config EGLIBC_VERSION_2_17 + bool + +endif -- cgit v1.2.3