diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-08-22 21:59:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-08-22 21:59:07 +0200 |
| commit | f6e522c3ff8e6dcfaf632356971ddd6de4ec6c97 (patch) | |
| tree | eaca66c49c6b63adb9881fd2886dd7670e26516b | |
| parent | 149f511995d263e7596b9a75e85d11e2ff171bf0 (diff) | |
update uClibc-ng to 1.0.6, no symlinking required
| -rw-r--r-- | package/uclibc-ng/Makefile | 5 | ||||
| -rw-r--r-- | target/config/Config.in.libc.choice | 4 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 4 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile.inc | 8 |
5 files changed, 9 insertions, 14 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index e05aae22e..e9444afd2 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -47,11 +47,6 @@ ifneq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),y) $(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc-$(PKG_VER).so \ $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc.so.* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) - # backward compatible symlink - -test -f $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH)/ld-uClibc.so.1 && \ - cd $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) && ln -sf ld-uClibc.so.1 ld-uClibc.so.0 - -test -f $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH)/ld64-uClibc.so.1 && \ - cd $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) && ln -sf ld64-uClibc.so.1 ld64-uClibc.so.0 -for file in libcrypt libdl libm libresolv libutil; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH); \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VER).so \ diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 022b36956..486562a36 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -69,8 +69,8 @@ endchoice choice prompt "C library version" -config ADK_TARGET_LIB_UCLIBC_NG_1_0_5 - bool "1.0.5" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_6 + bool "1.0.6" depends on ADK_TARGET_LIB_UCLIBC_NG config ADK_TARGET_LIB_UCLIBC_NG_GIT diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index a217d7bd9..5987496ed 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -22,7 +22,7 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string - default "1.0.5" if ADK_TARGET_LIB_UCLIBC_NG_1_0_5 + default "1.0.6" if ADK_TARGET_LIB_UCLIBC_NG_1_0_6 default "1.1.10" if ADK_TARGET_LIB_MUSL_1_1_10 default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2 default "2.19" if ADK_TARGET_LIB_GLIBC_2_19 @@ -36,7 +36,7 @@ config ADK_LIBC_VERSION config ADK_TARGET_LIB_UCLIBC_NG_1_0 bool - default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_5 + default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_6 config ADK_TARGET_SUFFIX string diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 8e3dc2098..0bfb5a36e 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -290,7 +290,7 @@ endif $(WRKBUILD)/.compiled: PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX= \ - DEVEL_PREFIX=/ \ + DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ HOSTCC="$(HOST_CC)" \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index 7d1ac0935..63882ab38 100644 --- a/toolchain/uclibc-ng/Makefile.inc +++ b/toolchain/uclibc-ng/Makefile.inc @@ -7,10 +7,10 @@ PKG_VERSION:= git PKG_RELEASE:= 1 PKG_SITES:= git://uclibc-ng.org/git/uclibc-ng endif -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_5),y) -PKG_VERSION:= 1.0.5 +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_6),y) +PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 -PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.5/ -PKG_HASH:= 7a16bc9ff03b8f74f1f0cf921412f08e48a15285d9d555560d5cca915a28df5f +PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.6/ +PKG_HASH:= afb2ec318fe5b115165e3fdc22964a2fd2b68e03a652ac36164ed096b4bb795c endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz |