Drop support for i586

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

diff --git a/lfs/glibc b/lfs/glibc
index 985fe671c29f944e2f04234a0a2b8c2c98f8d21f..d2d3aff91a91405e8580e6d6c096f2597a89709b 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,10 +24,10 @@
 
 include Config
 
-VER        = 2.25
+VER        = 2.33
 
 THISAPP    = glibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -51,36 +51,19 @@ else
        libc_cv_c_cleanup=yes
 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-bind-now \
+       --disable-crypt
 
 ###############################################################################
 # Top-level Rules
@@ -90,7 +73,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0c9f827298841dbf3bff3060f3d7f19c
+$(DL_FILE)_MD5 = 390bbd889c7e8e8a7041564cb6b27cca
 
 install : $(TARGET)
 
@@ -122,7 +105,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/glibc-build
 
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-2.25-gcc-7.patch
+       # Security Fixes
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.33-use-__pthread_attr_copy-in-mq_notify-bug-27896.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.33-librt-fix-null-pointer-dereference-bug-28213.patch
+
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
 
 ifneq "$(TOOLCHAIN)" "1"
@@ -131,12 +117,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
@@ -149,12 +130,14 @@ endif
        cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
                CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 
+       cd $(DIR_APP) && sed '/test-installation/s@\$$(PERL)@echo not running@' -i Makefile
+
        cd $(DIR_SRC)/glibc-build && make install
 
 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