]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/glibc
libvirt: Depend on ebtables
[ipfire-2.x.git] / lfs / glibc
index 985fe671c29f944e2f04234a0a2b8c2c98f8d21f..802c372a904bf283fe2d3bd26b220d058b7fa2fe 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
 
 include Config
 
-VER        = 2.25
+VER        = 2.32
 
 THISAPP    = glibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -51,19 +51,8 @@ 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
+ifeq "$(BUILD_ARCH)" "aarch64"
+       CFLAGS += -Wno-error=maybe-uninitialized
 endif
 
 # Disable hardware FP for armv5tel
@@ -74,13 +63,13 @@ 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-nss-crypt
 
 ###############################################################################
 # Top-level Rules
@@ -90,7 +79,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0c9f827298841dbf3bff3060f3d7f19c
+$(DL_FILE)_MD5 = 720c7992861c57cf97d66a2f36d8d1fa
 
 install : $(TARGET)
 
@@ -122,7 +111,6 @@ $(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
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
 
 ifneq "$(TOOLCHAIN)" "1"
@@ -149,12 +137,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