aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs
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 /package/libs
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 'package/libs')
-rw-r--r--package/libs/toolchain/Makefile16
1 files changed, 2 insertions, 14 deletions
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile
index 4822ca7be3..cf4a209054 100644
--- a/package/libs/toolchain/Makefile
+++ b/package/libs/toolchain/Makefile
@@ -323,9 +323,6 @@ LIBGCC_SO=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*))
define Build/Compile/uClibc
$(CP) \
$(TOOLCHAIN_DIR)/lib/libuClibc-*.so \
- $(TOOLCHAIN_DIR)/lib/libcrypt-*.so \
- $(TOOLCHAIN_DIR)/lib/libm-*.so \
- $(TOOLCHAIN_DIR)/lib/libpthread-*.so \
$(PKG_BUILD_DIR)/
endef
ifneq ($(LIBGCC_SO),)
@@ -395,17 +392,8 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(TOOLCHAIN_DIR)/lib/libc.so.* \
$(TOOLCHAIN_DIR)/lib/libuClibc-$(LIBC_SO_VERSION).so \
$(1)/lib/
- for file in libcrypt libdl libm libutil; do \
- $(CP) \
- $(TOOLCHAIN_DIR)/lib/$$$$file.so.* \
- $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so \
- $(1)/lib/; \
- done
-
$(CP) \
$(PKG_BUILD_DIR)/libuClibc-* \
- $(PKG_BUILD_DIR)/libm-* \
- $(PKG_BUILD_DIR)/libcrypt-* \
$(1)/lib/
endef
@@ -437,7 +425,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
define Package/libpthread/install
$(INSTALL_DIR) $(1)/lib
- ifneq ($(CONFIG_USE_MUSL),y)
+ ifneq ($(CONFIG_USE_MUSL)$(CONFIG_USE_UCLIBC),y)
$(CP) \
$(TOOLCHAIN_DIR)/lib/libpthread.so.* \
$(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \
@@ -462,7 +450,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
define Package/librt/install
$(INSTALL_DIR) $(1)/lib
- ifneq ($(CONFIG_USE_MUSL),y)
+ ifneq ($(CONFIG_USE_MUSL)$(CONFIG_USE_UCLIBC),y)
$(CP) \
$(TOOLCHAIN_DIR)/lib/librt.so.* \
$(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so \