]> git.ipfire.org Git - ipfire-3.x.git/blobdiff - glibc/glibc.nm
kernel: Update to 5.3.8
[ipfire-3.x.git] / glibc / glibc.nm
index 26a6d3b164e1e30297b9a69f918966b54f953262..eb3f7e2ccd1d33b8cefbb013f4fadb68d92494c1 100644 (file)
@@ -4,12 +4,12 @@
 ###############################################################################
 
 name       = glibc
-version    = 2.14
-release    = 4
+version    = 2.29
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
-url        = http://sources.redhat.com/glibc/
+url        = http://www.gnu.org/software/libc/libc.html
 license    = GPLv2+ LGPLv2+
 summary    = The GNU libc libraries.
 
@@ -23,30 +23,36 @@ description
        Linux system will not function.
 end
 
-source_dl  = http://ftp.gnu.org/gnu/glibc/
+source_dl  = https://ftp.gnu.org/gnu/glibc/
 sources    = %{thisapp}.tar.xz
 
 build
        # Optimize glibc for kernel
-       OPTIMIZED_KERNEL = 2.6.32
+       OPTIMIZED_KERNEL = 3.2
 
        requires
-               audit-devel
                autoconf
                automake
+               binutils >= 2.29
+               bison
+               gcc >= 8
                gettext
-               kernel-headers>=%{OPTIMIZED_KERNEL}
+               kernel-headers >= %{OPTIMIZED_KERNEL}
                libcap-devel
-               libselinux-devel
+               libstdc++-static
+               make >= 4.0
+               python3 >= 3.4
                texinfo
        end
 
        # Build glibc with custom cflags
-       GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -DPIC
+       GLIBC_FLAGS = -O2 -g -DNDEBUG -pipe
 
        if "%{DISTRO_ARCH}" == "i686"
                GLIBC_FLAGS += -march=i686 -mtune=generic
-       elif "%{DISTRO_ARCH}" == "x86_64"
+       end
+
+       if "%{DISTRO_ARCH}" == "x86_64"
                GLIBC_FLAGS += -mtune=generic
        end
 
@@ -65,120 +71,53 @@ build
                # program interpreter to /bin/bash in case another /bin/sh is installed.
                sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
 
-               # We don't install pt_chown(1) on the final system, so why install it to
-               # $(TOOLS_DIR):
+               # We don't install pt_chown(1) on the final system
                sed -e "/^install.*pt_chown/d" -i login/Makefile
 
                # Build nscd with -fstack-protector-all, instead of -fstack-protector:
-               sed -e "s/fstack-protector/&-all/" -i nscd/Makefile
-
-               cat %{DIR_SOURCE}/glibc-stack_chk_fail.c > debug/stack_chk_fail.c
+               sed -e "s/fstack-protector/&-strong/" -i nscd/Makefile
 
                # Use gnu hash style
                sed -i Makeconfig \
                        -e "s/-Wl,--hash-style=both/-Wl,--hash-style=gnu -Wl,-O1/"
 
-               # stdlib/tst-putenvmod is not linked against libc.
-               sed -i stdlib/Makefile \
-                       -e "s/^CFLAGS-tst-putenvmod.c.*/& -fno-stack-protector/g"
-
-               # stdio-common/bug22 hits timeout.
-               sed -i stdio-common/bug22.c \
-                       -e "s/#define TIMEOUT.*/#define TIMEOUT 300/"
-
-               # These tests don't work or need more investigation:
-               sed -i dlfcn/Makefile -e "s/default //g"
-
-               sed -i nptl/Makefile \
-                       -e "s/tst-mutex5 //g" \
-                       -e "s/tst-mutex5a //g" \
-                       -e "s/tst-cond11 //g" \
-                       -e "s/tst-rwlock6 //g" \
-                       -e "s/tst-rwlock7 //g" \
-                       -e "s/tst-sem5 //g" \
-                       -e "s/tst-cancelx4 //g" \
-                       -e "s/tst-cancelx5 //g" \
-                       -e "s/tst-cancelx10 //g" \
-                       -e "s/tst-cancelx18 //g" \
-                       -e "s/tst-signal1 //g"
-
-               # These are known to fail on x86:
-               sed -i rt/Makefile \
-                       -e "s/tst-cpuclock1 //g" \
-                       -e "s/tst-cpuclock2 //g"
-
-               sed -i elf/Makefile \
-                       -e "s/tst-tls1 //g" \
-                       -e "s/tst-tls1-static //g" \
-                       -e "s/tst-tls2 //g" \
-                       -e "s/tst-tls2-static //g" \
-                       -e "s/tst-tls3 //g" \
-                       -e "s/resolvfail //g" \
-                       -e "s/constload1 //g" \
-                       -e "s/order //g" \
-                       -e "s/lateglobal //g" \
-                       -e "s/dblload //g" \
-                       -e "s/dblunload //g" \
-                       -e "s/reldep6 //g" \
-                       -e "s/circleload1 //g" \
-                       -e "s/tst-global1 //g" \
-                       -e "s/tst-audit2 //g" \
-                       -e "s/check-localplt //g" \
-                       -e "s/check-localplt.out$$//g"
-
-               sed -i signal/Makefile \
-                       -e "s/tst-sigset2//g"
+               # http://sourceware.org/ml/libc-ports/2011-09/msg00018.html
+               sed -e "s/PIC/SHARED/g" -i sysdeps/arm/{set,__long}jmp.S
+       end
+
+       configure_options = \
+               --build=%{DISTRO_BUILDTARGET} \
+               --prefix=/usr \
+               --libexecdir=%{libdir}/glibc \
+               --disable-profile \
+               --enable-add-ons \
+               --enable-kernel=%{OPTIMIZED_KERNEL} \
+               --disable-werror \
+               --enable-stack-protector=strong \
+               --enable-bind-now \
+               --enable-obsolete-rpc \
+               --with-bugurl=http://bugtracker.ipfire.org \
+               --enable-lock-elision \
+               --enable-cet
+
+       if "%{DISTRO_ARCH}" == "armv5tel"
+               # Disable hardware FP for ARM.
+               configure_options += \
+                       --without-fp
        end
 
        build
-               mkdir %{DIR_SRC}/glibc-build
+               mkdir -p %{DIR_SRC}/glibc-build
                cd %{DIR_SRC}/glibc-build
 
                CFLAGS="${CFLAGS} -fno-asynchronous-unwind-tables" \
                ../%{thisapp}/configure \
-                       --build=%{DISTRO_BUILDTARGET} \
-                       --host=%{DISTRO_BUILDTARGET} \
-                       --prefix=/usr \
-                       --libexecdir=/usr/lib/glibc \
-                       --disable-profile \
-                       --enable-add-ons \
-                       --enable-kernel=%{OPTIMIZED_KERNEL} \
-                       --with-selinux \
-                       --disable-werror \
-                       --enable-bind-now \
-                       --enable-__thread \
-                       --enable-tls \
-                       --enable-experimental-malloc \
-                       --with-gd \
-                       --with-nss-crypt
-
-               sed -i config.make \
-                       -e "s/^build-pic-default=.*/build-pic-default=yes/"
-
-               # Our GCC is already passing -fPIC, and that's all we want for the libraries.
-               # LDFLAGS.so is appended to so we don't build shared libraries with
-               # DT_TEXTREL (and to tell us if something goes wrong). For now we only build
-               # the libraries, not the programs:
-               echo "build-programs=no" >> configparms
-
-               make PARALLELMFLAGS=%{PARALLELISMFLAGS} \
-                       CFLAGS="%{CFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE" \
-                       CXXFLAGS="%{CXXFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE"
+                       %{configure_options}
 
-               # Then build the programs with hardening, so everything possible in
-               # is hardened:
-               echo "# Nothing in here :D" > configparms
                make PARALLELMFLAGS=%{PARALLELISMFLAGS} \
                        CFLAGS="%{CFLAGS}" CXXFLAGS="%{CXXFLAGS}"
        end
 
-       #test
-       #       cd $(DIR_SRC)/glibc-build
-       #       make check TIMEOUTFACTOR=16 \
-       #               CFLAGS="%{CFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE" \
-       #               CXXFLAGS="%{CXXFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE"
-       #end
-
        install
                cd %{DIR_SRC}/glibc-build
                make install install_root=%{BUILDROOT}
@@ -188,16 +127,15 @@ build
                # This would install all locales that are supported
                make localedata/install-locales install_root=%{BUILDROOT}
 
-               # Timezone
-               cp -v --remove-destination %{BUILDROOT}/usr/share/zoneinfo/GMT \
-                       %{BUILDROOT}/etc/localtime
-               rm -rf %{BUILDROOT}/usr/share/zoneinfo
-
                # 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 \
                        %{BUILDROOT}/usr/bin/rpcinfo
@@ -206,79 +144,67 @@ build
                rm -vf %{BUILDROOT}/etc/ld.so.cache
 
                # Include /usr/lib/gconv/gconv-modules.cache
-               > %{BUILDROOT}/usr/lib/gconv/gconv-modules.cache
-               chmod 644 %{BUILDROOT}/usr/lib/gconv/gconv-modules.cache
+               > %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache
+               chmod 644 %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache
 
-               strip -g %{BUILDROOT}/usr/lib/*.o
+               strip -g %{BUILDROOT}%{libdir}/*.o
 
                # Move some libs to correct place
-               mv -v %{BUILDROOT}/lib/lib{memusage,pcprofile}.so %{BUILDROOT}/usr/lib/
+               mv -v %{BUILDROOT}/%{lib}/lib{memusage,pcprofile}.so %{BUILDROOT}%{libdir}
+
+               # Fix library permissions.
+               chmod 755 %{BUILDROOT}%{libdir}/lib*.so*
+
+               # rquota.x and rquota.h are now provided by quota
+               rm -vf %{BUILDROOT}%{includedir}/rpcsvc/rquota.[hx]
        end
 
        keep_libraries
-               /usr/lib/libc_nonshared.a
-               /usr/lib/libpthread_nonshared.a
+               %{libdir}/libc_nonshared.a
+               %{libdir}/libmvec_nonshared.a
+               %{libdir}/libpthread_nonshared.a
        end
 end
 
 packages
        package glibc
-               requires = glibc-common=%{thisver}      
-       end
+               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
 
-       package glibc-common
-               # XXX description and summary are missing
+               requires
+                       tzdata
+               end
 
-               requires = tzdata
+               conflicts
+                       kernel < %{OPTIMIZED_KERNEL}
+               end
 
-               files
-                       /usr/bin
-                       /usr/sbin
-                       /usr/share
-                       !/usr/share/zoneinfo
+               obsoletes
+                       glibc-common < %{thisver}
                end
        end
 
        package glibc-devel
-               summary = Object files for development using standard C libraries.
-               description
-                       The glibc-devel package contains the object files necessary
-                       for developing programs which use the standard C libraries (which are
-                       used by nearly all programs).  If you are developing programs which
-                       will use the standard C libraries, your system needs to have these
-                       standard object files available in order to create the
-                       executables.
-
-                       Install glibc-devel if you are going to develop programs which will
-                       use the standard C libraries.
-               end
-               group = Development/Libraries
-
-               requires = glibc-headers=%{thisver}
-
-               files = /usr/lib/*.a /usr/lib/*.o
-       end
+               template DEVEL
 
-       package glibc-headers
-               description
-                       The glibc-headers package contains the header files necessary
-                       for developing programs which use the standard C libraries (which are
-                       used by nearly all programs).  If you are developing programs which
-                       will use the standard C libraries, your system needs to have these
-                       standard header files available in order to create the
-                       executables.
-
-                       Install glibc-headers if you are going to develop programs which will
-                       use the standard C libraries.
+               requires
+                       glibc = %{thisver}
+                       glibc-headers = %{thisver}
+                       kernel-headers >= %{OPTIMIZED_KERNEL}
                end
 
-               requires = kernel-headers
+               provides
+                       glibc-headers = %{thisver}
+               end
 
-               files
-                       /usr/include
-                       !/usr/include/linuxthreads
-                       !/usr/include/gnu/stubs-[32164]*.h
+               obsoletes
+                       glibc-headers < %{thisver}
                end
+
+               files += %{libdir}/*.[ao]
        end
 
        package nscd
@@ -309,8 +235,12 @@ packages
                        /usr/bin/mtrace
                        /usr/bin/pcprofiledump
                        /usr/bin/xtrace
-                       /usr/lib/libmemusage.so
-                       /usr/lib/libpcprofile.so
+                       %{libdir}/libmemusage.so
+                       %{libdir}/libpcprofile.so
                end
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end