SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

toolchain/uclibc: Bump version to 1.0.22

Browse Source 
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>
This commit is contained in:
Alexey Brodkin
2017-02-10 22:01:10 +03:00
committed by Felix Fietkau
parent eed6c85b7f
commit a3408a5271
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/libs/toolchain/Makefile
View File

@@ -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 \