mpd: build without UPnP support

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

diff --git a/lfs/glibc b/lfs/glibc
index 122aca58fdd6b6927770d3473be865a7ceb65260..50217fab6e40ac52cf9f11e81a42b208fbe2160a 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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,14 +24,14 @@
 
 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)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
@@ -45,21 +45,14 @@ else
   EXTRA_CONFIG = \
        --host=$(CROSSTARGET) \
        --build=$(BUILDTARGET) \
-       --prefix=/tools \
-       --with-headers=/tools/include \
+       --prefix=$(TOOLS_DIR) \
+       --with-headers=$(TOOLS_DIR)/include \
        libc_cv_forced_unwind=yes \
        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 -mno-tls-direct-seg-refs
+ifeq "$(BUILD_ARCH)" "aarch64"
+       CFLAGS += -Wno-error=maybe-uninitialized
 endif
 
 # Disable hardware FP for armv5tel
@@ -70,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-crypt
 
 ###############################################################################
 # Top-level Rules
@@ -86,7 +79,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0c9f827298841dbf3bff3060f3d7f19c
+$(DL_FILE)_MD5 = 720c7992861c57cf97d66a2f36d8d1fa
 
 install : $(TARGET)
 
@@ -144,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
@@ -160,8 +155,8 @@ ifeq "$(TOOLCHAIN)" "1"
        cd $(DIR_APP) && echo "int main() { return 0; }" > dummy.c
        cd $(DIR_APP) && $(CROSSTARGET)-gcc dummy.c -o dummy
 
-       # Must be using a runtime linker from /tools
-       cd $(DIR_APP) && readelf -l dummy | grep "Requesting program interpreter: /tools"
+       # Must be using a runtime linker from $(TOOLS_DIR)
+       cd $(DIR_APP) && readelf -l dummy | grep "Requesting program interpreter: $(TOOLS_DIR)"
        cd $(DIR_APP) && rm -vf dummy dummy.c
 endif