diff options
Diffstat (limited to 'toolchain/glibc')
| -rw-r--r-- | toolchain/glibc/Makefile | 9 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 14 |
2 files changed, 13 insertions, 10 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 5389b8416..4d87f5789 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -19,14 +19,17 @@ TARGET_CXXFLAGS:= $(filter-out -ffast-math,$(TARGET_CXXFLAGS)) GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(GNU_TARGET_NAME) \ --with-headers=$(STAGING_TARGET_DIR)/usr/include \ - --enable-stackguard-randomization \ --disable-sanity-checks \ - --disable-nls \ --disable-werror \ --disable-nscd \ - --disable-default-pie \ --enable-shared +ifeq ($(ADK_TARGET_LINUX_ARCH_SPARC64),y) +GLIBC_CONFOPTS+= --disable-default-pie +else +GLIBC_CONFOPTS+= --enable-default-pie +endif + ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) GLIBC_CONFOPTS+= --enable-static-nss endif diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 0cd8f4987..724acfc06 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -3,16 +3,16 @@ PKG_NAME:= glibc ifeq ($(ADK_LIBC_VERSION),git) -PKG_VERSION:= 2.39.90 -PKG_GLIBCVER:= 2.39.9000 +PKG_VERSION:= 2.40.90 +PKG_GLIBCVER:= 2.40.9000 PKG_SITES:= https://sourceware.org/git/glibc.git PKG_RELEASE:= 1 endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_39),y) -PKG_VERSION:= 2.39 -PKG_GLIBCVER:= 2.39 +ifeq ($(ADK_TARGET_LIB_GLIBC_2_40),y) +PKG_VERSION:= 2.40 +PKG_GLIBCVER:= 2.40 PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} -PKG_HASH:= f77bd47cf8170c57365ae7bf86696c118adb3b120d3259c64c502d3dc1e2d926 +PKG_HASH:= 2abc038f5022949cb67e996c3cae0e7764f99b009f0b9b7fd954dfc6577b599e endif -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz |