Browse Source

glibc: update to 2.28

Waldemar Brodkorb 5 years ago
parent
commit
f8e4596e45
3 changed files with 11 additions and 11 deletions
  1. 3 3
      target/config/Config.in.libc
  2. 2 2
      toolchain/glibc/Makefile
  3. 6 6
      toolchain/glibc/Makefile.inc

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

@@ -152,8 +152,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_27
-	bool "2.27"
+config ADK_TARGET_LIB_GLIBC_2_28
+	bool "2.28"
 	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_CSKY
 
 config ADK_TARGET_LIB_GLIBC_CSKY
@@ -211,7 +211,7 @@ config ADK_LIBC_VERSION
 	string
 	default "1.0.30" if ADK_TARGET_LIB_UCLIBC_NG_1_0_30
 	default "1.1.19" if ADK_TARGET_LIB_MUSL_1_1_19
-	default "2.27" if ADK_TARGET_LIB_GLIBC_2_27
+	default "2.28" if ADK_TARGET_LIB_GLIBC_2_28
 	default "3.0.0" if ADK_TARGET_LIB_NEWLIB_3_0_0
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \

+ 2 - 2
toolchain/glibc/Makefile

@@ -29,7 +29,7 @@ ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
 GLIBC_CONFOPTS+=	--enable-static-nss
 endif
 
-GLIBC_ENV:=             PATH='${TARGET_PATH}' \
+GLIBC_ENV:=             PATH='${HOST_PATH}:${TARGET_PATH}' \
                         BUILD_CC=${CC_FOR_BUILD} \
                         CFLAGS="$(TARGET_CFLAGS)" \
                         CXXFLAGS="$(TARGET_CXXFLAGS)" \
@@ -65,7 +65,7 @@ $(WRKBUILD)/.compiled:
 $(WRKBUILD)/.installed:
 	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_TARGET_DIR) install
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,lp64,soft,hard}.h
 	mkdir -p ${STAGING_TARGET_DIR}/etc
 	${INSTALL_DATA} ${WRKBUILD}/posix/gai.conf ${STAGING_TARGET_DIR}/etc
 	${INSTALL_DATA} ${WRKBUILD}/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc

+ 6 - 6
toolchain/glibc/Makefile.inc

@@ -3,17 +3,17 @@
 
 PKG_NAME:=		glibc
 ifeq ($(ADK_LIBC_VERSION),git)
-PKG_VERSION:=		2.27.90
-PKG_GLIBCVER:=		2.27.9000
+PKG_VERSION:=		2.28.90
+PKG_GLIBCVER:=		2.28.9000
 PKG_SITES:=		git://sourceware.org/git/glibc.git
 PKG_RELEASE:=		1
 endif
-ifeq ($(ADK_TARGET_LIB_GLIBC_2_27),y)
-PKG_VERSION:=		2.27
-PKG_GLIBCVER:=		2.27
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_28),y)
+PKG_VERSION:=		2.28
+PKG_GLIBCVER:=		2.28
 PKG_RELEASE:=		1
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
-PKG_HASH:=		5172de54318ec0b7f2735e5a91d908afe1c9ca291fec16b5374d9faadfc1fc72
+PKG_HASH:=		b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082
 endif
 ifeq ($(ADK_TARGET_LIB_GLIBC_CSKY),y)
 PKG_VERSION:=           master