Skip to content

Commit

Permalink
toolchain: glibc: update to glibc 2.38
Browse files Browse the repository at this point in the history
This updates to glibc to version 2.38.

Add --enable-crypt since the crypt function got disabled in 2.38, but we
still need it.
Also add the newly introduced --enable-fortify-source flag and hook it up
to the build system.

Signed-off-by: Kazuki H <kazukih0205@gmail.com>
  • Loading branch information
Kaz205 committed Dec 22, 2023
1 parent 4a2ff73 commit 186f283
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
9 changes: 6 additions & 3 deletions toolchain/glibc/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=glibc
PKG_VERSION:=2.37
PKG_VERSION:=2.38
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3
PKG_MIRROR_HASH:=4d5b3de6ec7b47427700f74fdb529e32083b54a512f6ca86ec824a61092ecdd4
PKG_SOURCE_VERSION:=44f757a6364a546359809d48c76b3debd26e77d4
PKG_MIRROR_HASH:=60cd1d015d353b737e3f63cabafb60d20f3cc3cfed121029449fffd5265d0096
PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_CPE_ID:=cpe:/a:gnu:glibc
Expand Down Expand Up @@ -61,10 +61,13 @@ GLIBC_CONFIGURE:= \
--without-gd \
--without-cvs \
--enable-add-ons \
--enable-crypt \
--$(if $(CONFIG_SOFT_FLOAT),without,with)-fp \
$(if $(CONFIG_PKG_CC_STACKPROTECTOR_REGULAR),--enable-stack-protector=yes) \
$(if $(CONFIG_PKG_CC_STACKPROTECTOR_STRONG),--enable-stack-protector=strong) \
$(if $(CONFIG_PKG_RELRO_FULL),--enable-bind-now) \
$(if $(CONFIG_PKG_FORTIFY_SOURCE_1),--enable-fortify-source=1) \
$(if $(CONFIG_PKG_FORTIFY_SOURCE_2),--enable-fortify-source=2) \
--enable-kernel=5.15.0

export libc_cv_ssp=no
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ provides them.
int totfails = 0;

int main (int argc, char *argv[]);
@@ -119,13 +103,3 @@ put8 (char *cp)
@@ -123,13 +107,3 @@ put8 (char *cp)
printf("%02x", t);
}
}
Expand Down Expand Up @@ -469,7 +469,7 @@ provides them.
* Encode Binary Data:: Encoding and Decoding of Binary Data.
* Argz and Envz Vectors:: Null-separated string vectors.
@end menu
@@ -2423,73 +2423,73 @@ functionality under a different name, su
@@ -2512,73 +2512,73 @@ functionality under a different name, su
systems it may be in @file{strings.h} instead.
@end deftypefun

Expand Down Expand Up @@ -627,7 +627,7 @@ provides them.
range [FROM - N + 1, FROM - 1]. If N is odd the first byte in FROM
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -984,6 +984,12 @@ extern int getsubopt (char **__restrict
@@ -1103,6 +1103,12 @@ extern int getsubopt (char **__restrict
#endif


Expand Down
2 changes: 1 addition & 1 deletion toolchain/glibc/patches/200-add-dl-search-paths.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ add /usr/lib to default search path for the dynamic linker

--- a/Makeconfig
+++ b/Makeconfig
@@ -631,6 +631,9 @@ else
@@ -632,6 +632,9 @@ else
default-rpath = $(libdir)
endif

Expand Down

0 comments on commit 186f283

Please sign in to comment.