Revert "python-six: Removal of python2 & 3 addon versions of six"

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

diff --git a/lfs/glibc b/lfs/glibc
index 7c12ea48ad7617c466e5c6ebd39f1317a0c18682..50217fab6e40ac52cf9f11e81a42b208fbe2160a 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-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        #
@@ -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
@@ -80,7 +69,7 @@ EXTRA_CONFIG += \
        --without-selinux \
        --enable-experimental-malloc \
        --enable-bind-now \
-       --disable-nss-crypt
+       --disable-crypt
 
 ###############################################################################
 # Top-level Rules