Skip to content

Commit 5fc74ab

Browse files
committed
Adding Glibc 2.24 support
1 parent 0d1cc24 commit 5fc74ab

File tree

4 files changed

+35
-2
lines changed

4 files changed

+35
-2
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--- glibc-2.24/misc/regexp.c_bkp 2021-10-11 01:25:18.503972709 -0700
2+
+++ glibc-2.24/misc/regexp.c 2021-10-11 01:26:28.256366941 -0700
3+
@@ -30,13 +30,13 @@
4+
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
5+
6+
/* Define the variables used for the interface. */
7+
-char *loc1;
8+
-char *loc2;
9+
+char *loc1 __attribute__ ((nocommon));
10+
+char *loc2 __attribute__ ((nocommon));
11+
compat_symbol (libc, loc1, loc1, GLIBC_2_0);
12+
compat_symbol (libc, loc2, loc2, GLIBC_2_0);
13+
14+
/* Although we do not support the use we define this variable as well. */
15+
-char *locs;
16+
+char *locs __attribute__ ((nocommon));
17+
compat_symbol (libc, locs, locs, GLIBC_2_0);
18+
19+

package/glibc/2.24/glibc.hash

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Locally calculated (fetched from Github)
2+
sha256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 glibc-2.24.tar.xz
3+

package/glibc/Config.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ if BR2_TOOLCHAIN_BUILDROOT_GLIBC
22

33
comment "Glibc Options"
44

5+
config BR2_PACKAGE_GLIBC_LEGACY
6+
bool "2.24"
7+
default n
8+
help
9+
"For Legacy deployments, Use Glibc2.24."
10+
511
config BR2_PACKAGE_GLIBC
612
bool
713
default y

package/glibc/glibc.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION))
1313
else ifeq ($(BR2_csky),y)
1414
GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176
1515
GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION))
16+
else ifeq ($(BR2_PACKAGE_GLIBC_LEGACY),y)
17+
GLIBC_VERSION = 2.24
18+
GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
19+
GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
20+
GLIBC_SRC_SUBDIR = .
1621
else
1722
# Generate version string using:
1823
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
@@ -119,8 +124,8 @@ define GLIBC_CONFIGURE_CMDS
119124
# Do the configuration
120125
(cd $(@D)/build; \
121126
$(TARGET_CONFIGURE_OPTS) \
122-
CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
123-
CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \
127+
CFLAGS="-Wno-error -O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
128+
CXXFLAGS="-Wno-error -O2 $(GLIBC_EXTRA_CFLAGS)" \
124129
$(GLIBC_CONF_ENV) \
125130
$(SHELL) $(@D)/configure \
126131
--target=$(GNU_TARGET_NAME) \

0 commit comments

Comments
 (0)