ncurses-compat: Fix BLAKE2 checksum

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

diff --git a/lfs/glibc b/lfs/glibc
index 4530f2ddd6c3581ee8516401f404e07591419433..d4b1eb0dd3cc5ed4a49f29827546c38bf2b6c6b9 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  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.28
+VER        = 2.35
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,44 +46,30 @@ 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
 
-# Enable some extra optimization for the glibc code
-CFLAGS = -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC
-
-ifeq "$(BUILD_ARCH)" "armv7hl"
-       CFLAGS += -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
-endif
-
-ifeq "$(BUILD_ARCH)" "i586"
-       CFLAGS += -march=i586 -mtune=generic -mindirect-branch=thunk -mfunction-return=thunk -mno-tls-direct-seg-refs
-endif
-
-ifeq "$(BUILD_ARCH)" "x86_64"
-       CFLAGS += -mindirect-branch=thunk -mfunction-return=thunk
-endif
-
-# Disable hardware FP for armv5tel
-ifeq "$(BUILD_ARCH)" "armv5tel"
-       EXTRA_CONFIG += \
-               --without-fp
+ifeq "$(BUILD_ARCH)" "aarch64"
+       CFLAGS += -Wno-error=maybe-uninitialized
 endif
 
 # Add some general configuration flags
 EXTRA_CONFIG += \
-       --enable-obsolete-rpc \
        --disable-profile \
-       --enable-kernel=3.2 \
+       --enable-kernel=4.14.0 \
        --enable-add-ons \
        --without-selinux \
        --enable-experimental-malloc \
        --enable-bind-now \
-       --enable-obsolete-rpc \
-       --enable-obsolete-nsl \
-       --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
@@ -93,7 +79,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c81d2388896379997bc359d4f2084239
+$(DL_FILE)_BLAKE2 = 623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063
 
 install : $(TARGET)
 
@@ -101,10 +87,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -113,8 +99,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -133,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
@@ -158,7 +139,7 @@ endif
 ifneq "$(TOOLCHAIN)" "1"
        # Creating the locales
        mkdir -p /usr/lib/locale
-       cd $(DIR_SRC)/glibc-build && make localedata/install-locales
+       cd $(DIR_SRC)/glibc-build && make localedata/install-locales $(MAKETUNING)
 
        # Timezone data will be shipped by tzdata.
        rm -rfv /usr/share/zoneinfo