core166: Ship changes files

[people/mfischer/ipfire-2.x.git] / lfs / glibc

diff --git a/lfs/glibc b/lfs/glibc
index 281c290dcd2b7d92d14138ff57cc45c8c60351b2..3a61613eb947afcc4a5f1ebb8681367b6d7d5a01 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.32
+VER        = 2.35
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,21 +46,13 @@ else
        --host=$(CROSSTARGET) \
        --build=$(BUILDTARGET) \
        --prefix=$(TOOLS_DIR) \
-       --with-headers=$(TOOLS_DIR)/include \
-       libc_cv_forced_unwind=yes \
-       libc_cv_c_cleanup=yes
+       --with-headers=$(TOOLS_DIR)/include
 endif
 
 ifeq "$(BUILD_ARCH)" "aarch64"
        CFLAGS += -Wno-error=maybe-uninitialized
 endif
 
-# Disable hardware FP for armv5tel
-ifeq "$(BUILD_ARCH)" "armv5tel"
-       EXTRA_CONFIG += \
-               --without-fp
-endif
-
 # Add some general configuration flags
 EXTRA_CONFIG += \
        --disable-profile \
@@ -69,7 +61,15 @@ EXTRA_CONFIG += \
        --without-selinux \
        --enable-experimental-malloc \
        --enable-bind-now \
-       --disable-nss-crypt
+       --disable-crypt
+
+ifeq "$(BUILD_ARCH)" "x86_64"
+       EXTRA_CONFIG += --enable-cet
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+       EXTRA_CONFIG += --enable-memory-tagging
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -79,7 +79,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 720c7992861c57cf97d66a2f36d8d1fa
+$(DL_FILE)_MD5 = dd571c67d85d89d7f60b854a4e207423
 
 install : $(TARGET)
 
@@ -119,12 +119,7 @@ ifneq "$(TOOLCHAIN)" "1"
                scripts/test-installation.pl
  endif
 
- ifeq "$(BUILD_ARCH)" "i586"
-       cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
-               scripts/test-installation.pl
- endif
-
- ifeq "$(BUILD_ARCH)" "armv5tel"
+ ifeq "$(BUILD_ARCH)" "armv6l"
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
                scripts/test-installation.pl
  endif