glibc: Update to 2.36

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index eb3f7e2ccd1d33b8cefbb013f4fadb68d92494c1..ea59a895d53ae4e09efaa5060c084879b18251b6 100644 (file)
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = glibc
-version    = 2.29
+version    = 2.36
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -33,9 +33,9 @@ build
        requires
                autoconf
                automake
-               binutils >= 2.29
+               binutils >= 2.35
                bison
-               gcc >= 8
+               gcc >= 11
                gettext
                kernel-headers >= %{OPTIMIZED_KERNEL}
                libcap-devel
@@ -48,10 +48,6 @@ build
        # Build glibc with custom cflags
        GLIBC_FLAGS = -O2 -g -DNDEBUG -pipe
 
-       if "%{DISTRO_ARCH}" == "i686"
-               GLIBC_FLAGS += -march=i686 -mtune=generic
-       end
-
        if "%{DISTRO_ARCH}" == "x86_64"
                GLIBC_FLAGS += -mtune=generic
        end
@@ -59,8 +55,6 @@ build
        export CFLAGS   = %{GLIBC_FLAGS}
        export CXXFLAGS = %{GLIBC_FLAGS}
 
-       export QUALITY_AGENT_RPATH_ALLOW_ORIGIN=yes
-
        prepare_cmds
                # In the vi_VN.TCVN locale, bash enters an infinite loop at startup. It is
                # unknown whether this is a bash bug or a Glibc problem. Disable
@@ -96,16 +90,10 @@ build
                --enable-stack-protector=strong \
                --enable-bind-now \
                --enable-obsolete-rpc \
-               --with-bugurl=http://bugtracker.ipfire.org \
+               --with-bugurl=https://bugtracker.ipfire.org \
                --enable-lock-elision \
                --enable-cet
 
-       if "%{DISTRO_ARCH}" == "armv5tel"
-               # Disable hardware FP for ARM.
-               configure_options += \
-                       --without-fp
-       end
-
        build
                mkdir -p %{DIR_SRC}/glibc-build
                cd %{DIR_SRC}/glibc-build
@@ -130,11 +118,6 @@ build
                # Configuration
                cp -vf %{DIR_SOURCE}/{ld.so.conf,nsswitch.conf} %{BUILDROOT}/etc
                mkdir -pv %{BUILDROOT}/etc/{default,ld.so.conf.d}
-               install -p -m644 %{DIR_APP}/nis/nss %{BUILDROOT}/etc/default/nss
-
-               if [ "%{DISTRO_ARCH}" = "armv7hl" ]; then
-                       ln -svf ld-linux-armhf.so.3 %{BUILDROOT}/lib/ld-linux.so.3
-               fi
 
                # Remove unused binaries
                rm -vf %{BUILDROOT}/sbin/sln \
@@ -168,12 +151,6 @@ end
 
 packages
        package glibc
-               if "%{DISTRO_ARCH}" == "armv7hl"
-                       provides += ld-linux.so.3
-                       provides += ld-linux.so.3(GLIBC_2.4)
-                       provides += ld-linux.so.3(GLIBC_PRIVATE)
-               end
-
                requires
                        tzdata
                end