aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorAlexey Brodkin <Alexey.Brodkin@synopsys.com>2017-02-10 22:01:10 +0300
committerFelix Fietkau <nbd@nbd.name>2017-02-11 15:38:39 +0100
commita3408a5271ccb149fbbfdc249a4ff6ea031f8bcf (patch)
treee458df339b163af0e423358e590a765bda0422d2 /toolchain
parenteed6c85b7fbe35ac35df6d481510a239de456a68 (diff)
downloadupstream-a3408a5271ccb149fbbfdc249a4ff6ea031f8bcf.tar.gz
upstream-a3408a5271ccb149fbbfdc249a4ff6ea031f8bcf.tar.bz2
upstream-a3408a5271ccb149fbbfdc249a4ff6ea031f8bcf.zip
toolchain/uclibc: Bump version to 1.0.22
Important change was made in 1.0.18: all sub-libs were merged in one and only libc similarly to musl. See [1] for more details. To support that we had to remove refences to those sub-libs like libpthread, libcrypt, libdl, libm, libutil etc. [1] http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=29ff9055c80efe77a7130767a9fcb3ab8c67e8ce Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/Makefile6
-rw-r--r--toolchain/uClibc/common.mk4
2 files changed, 3 insertions, 7 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index a5fb54bd76..4764f2fa1d 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -23,19 +23,15 @@ define Host/Install
$(call Host/SetToolchainInfo)
$(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
$(CP) $(HOST_BUILD_DIR)/libc/libc_so.a $(TOOLCHAIN_DIR)/lib/
- $(CP) $(HOST_BUILD_DIR)/libpthread/*/libpthread_so.a $(TOOLCHAIN_DIR)/lib/
( cd $(TOOLCHAIN_DIR) ; \
for d in lib usr/lib ; do \
- for f in libc.so libpthread.so libgcc_s.so ; do \
+ for f in libc.so libgcc_s.so ; do \
if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \
$(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \
fi \
done \
done \
)
- rm -f \
- $(TOOLCHAIN_DIR)/lib/libresolv*.so* \
- $(TOOLCHAIN_DIR)/lib/libnsl*.so*
endef
$(eval $(call HostBuild))
diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index 0e3f5600d6..384d73233a 100644
--- a/toolchain/uClibc/common.mk
+++ b/toolchain/uClibc/common.mk
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.22
PKG_NAME:=uClibc-ng
PKG_SOURCE_URL = http://downloads.uclibc-ng.org/releases/$(PKG_VERSION)/
@@ -16,7 +16,7 @@ CONFIG_DIR:=$(PATH_PREFIX)/config
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
LIBC_SO_VERSION:=$(PKG_VERSION)
-PKG_HASH:=3c63d9f8c8b98b65fa5c4040d1c8ab1b36e99a16e1093810cedad51ac15c9a9e
+PKG_HASH:=f2004c85db8e07e9f1c2e8b7c513fa7c237bc9f9685d8e1bfc89535b8a85449b
HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)