Browse Source

glibc: update to 2.34

Waldemar Brodkorb 4 years ago
parent
commit
1a0dfceff0
3 changed files with 10 additions and 10 deletions
  1. 1 1
      package/glibc/Makefile
  2. 3 3
      target/config/Config.in.libc
  3. 6 6
      toolchain/glibc/Makefile.inc

+ 1 - 1
package/glibc/Makefile

@@ -52,7 +52,7 @@ ifeq ($(ADK_TARGET_ARCH_RISCV64),y)
 endif
 	for file in libc libpthread librt libcrypt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \
 		$(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
-		$(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
+		#$(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
 	done
 else
 	${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)

+ 3 - 3
target/config/Config.in.libc

@@ -154,8 +154,8 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
 	bool "git"
 	depends on ADK_TARGET_LIB_UCLIBC_NG && ADK_EXPERIMENTAL
 
-config ADK_TARGET_LIB_GLIBC_2_33
-	bool "2.33"
+config ADK_TARGET_LIB_GLIBC_2_34
+	bool "2.34"
 	depends on ADK_TARGET_LIB_GLIBC
 
 config ADK_TARGET_LIB_GLIBC_GIT
@@ -203,7 +203,7 @@ config ADK_LIBC_VERSION
 	string
 	default "1.0.38" if ADK_TARGET_LIB_UCLIBC_NG_1_0_38
 	default "1.2.2" if ADK_TARGET_LIB_MUSL_1_2_2
-	default "2.33" if ADK_TARGET_LIB_GLIBC_2_33
+	default "2.34" if ADK_TARGET_LIB_GLIBC_2_34
 	default "4.1.0" if ADK_TARGET_LIB_NEWLIB_4_1_0
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \

+ 6 - 6
toolchain/glibc/Makefile.inc

@@ -3,16 +3,16 @@
 
 PKG_NAME:=		glibc
 ifeq ($(ADK_LIBC_VERSION),git)
-PKG_VERSION:=		2.33.90
-PKG_GLIBCVER:=		2.33.9000
+PKG_VERSION:=		2.34.90
+PKG_GLIBCVER:=		2.34.9000
 PKG_SITES:=		git://sourceware.org/git/glibc.git
 PKG_RELEASE:=		1
 endif
-ifeq ($(ADK_TARGET_LIB_GLIBC_2_33),y)
-PKG_VERSION:=		2.33
-PKG_GLIBCVER:=		2.33
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_34),y)
+PKG_VERSION:=		2.34
+PKG_GLIBCVER:=		2.34
 PKG_RELEASE:=		1
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
-PKG_HASH:=		2e2556000e105dbd57f0b6b2a32ff2cf173bde4f0d85dffccfd8b7e51a0677ff
+PKG_HASH:=		44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2
 endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz