Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- config/rootfiles/common/aarch64/glibc | 27 +++++++++++++++++++++-- config/rootfiles/common/armv6l/glibc | 25 +++++++++++++++++++-- config/rootfiles/common/x86_64/glibc | 31 ++++++++++++++++++++++----- lfs/glibc | 8 +++---- 4 files changed, 77 insertions(+), 14 deletions(-)
diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc index 634f1686e..f98c94aab 100644 --- a/config/rootfiles/common/aarch64/glibc +++ b/config/rootfiles/common/aarch64/glibc @@ -2,7 +2,6 @@ etc/rpc lib/ld-linux-aarch64.so.1 lib/libBrokenLocale.so.1 -#lib/libSegFault.so lib/libanl.so.1 lib/libc.so.6 #lib/libc_malloc_debug.so.0 @@ -23,11 +22,11 @@ lib/libthread_db.so.1 lib/libutil.so.1 sbin/ldconfig #sbin/sln -#usr/bin/catchsegv #usr/bin/gencat usr/bin/getconf usr/bin/getent #usr/bin/iconv +usr/bin/ld.so usr/bin/ldd usr/bin/locale #usr/bin/localedef @@ -58,12 +57,14 @@ usr/bin/locale #usr/include/bits #usr/include/bits/a.out.h #usr/include/bits/argp-ldbl.h +#usr/include/bits/atomic_wide_counter.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h #usr/include/bits/cpu-set.h #usr/include/bits/dirent.h #usr/include/bits/dirent_ext.h +#usr/include/bits/dl_find_object.h #usr/include/bits/dlfcn.h #usr/include/bits/elfclass.h #usr/include/bits/endian.h @@ -101,6 +102,7 @@ usr/bin/locale #usr/include/bits/libc-header-start.h #usr/include/bits/libm-simd-decl-stubs.h #usr/include/bits/link.h +#usr/include/bits/link_lavcurrent.h #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/long-double.h @@ -135,6 +137,7 @@ usr/bin/locale #usr/include/bits/pthreadtypes.h #usr/include/bits/ptrace-shared.h #usr/include/bits/resource.h +#usr/include/bits/rseq.h #usr/include/bits/sched.h #usr/include/bits/select.h #usr/include/bits/select2.h @@ -453,6 +456,7 @@ usr/bin/locale #usr/include/sys/raw.h #usr/include/sys/reboot.h #usr/include/sys/resource.h +#usr/include/sys/rseq.h #usr/include/sys/select.h #usr/include/sys/sem.h #usr/include/sys/sendfile.h @@ -784,6 +788,7 @@ usr/lib/gconv #usr/lib/glibc/getconf/POSIX_V6_LP64_OFF64 #usr/lib/glibc/getconf/POSIX_V7_LP64_OFF64 #usr/lib/glibc/getconf/XBS5_LP64_OFF64 +#usr/lib/grcrt1.o #usr/lib/libBrokenLocale.a #usr/lib/libBrokenLocale.so #usr/lib/libanl.a @@ -807,6 +812,20 @@ usr/lib/gconv #usr/lib/libthread_db.so #usr/lib/libutil.a usr/lib/locale +#usr/lib/locale/C.utf8 +#usr/lib/locale/C.utf8/LC_ADDRESS +#usr/lib/locale/C.utf8/LC_COLLATE +#usr/lib/locale/C.utf8/LC_CTYPE +#usr/lib/locale/C.utf8/LC_IDENTIFICATION +#usr/lib/locale/C.utf8/LC_MEASUREMENT +#usr/lib/locale/C.utf8/LC_MESSAGES +#usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/C.utf8/LC_MONETARY +#usr/lib/locale/C.utf8/LC_NAME +#usr/lib/locale/C.utf8/LC_NUMERIC +#usr/lib/locale/C.utf8/LC_PAPER +#usr/lib/locale/C.utf8/LC_TELEPHONE +#usr/lib/locale/C.utf8/LC_TIME #usr/lib/locale/aa_DJ #usr/lib/locale/aa_DJ.utf8 #usr/lib/locale/aa_DJ.utf8/LC_ADDRESS @@ -7639,6 +7658,7 @@ usr/lib/locale #usr/lib/locale/zu_ZA/LC_PAPER #usr/lib/locale/zu_ZA/LC_TELEPHONE #usr/lib/locale/zu_ZA/LC_TIME +#usr/lib/rcrt1.o #usr/sbin/iconvconfig #usr/sbin/nscd #usr/sbin/zic @@ -7878,11 +7898,13 @@ usr/lib/locale #usr/share/i18n/charmaps/VISCII.gz #usr/share/i18n/charmaps/WINDOWS-31J.gz #usr/share/i18n/locales +#usr/share/i18n/locales/C #usr/share/i18n/locales/POSIX #usr/share/i18n/locales/aa_DJ #usr/share/i18n/locales/aa_ER #usr/share/i18n/locales/aa_ER@saaho #usr/share/i18n/locales/aa_ET +#usr/share/i18n/locales/ab_GE #usr/share/i18n/locales/af_ZA #usr/share/i18n/locales/agr_PE #usr/share/i18n/locales/ak_GH @@ -8244,6 +8266,7 @@ usr/lib/locale #usr/share/info/libc.info-15 #usr/share/info/libc.info-16 #usr/share/info/libc.info-17 +#usr/share/info/libc.info-18 #usr/share/info/libc.info-2 #usr/share/info/libc.info-3 #usr/share/info/libc.info-4 diff --git a/config/rootfiles/common/armv6l/glibc b/config/rootfiles/common/armv6l/glibc index 3348bc098..d6be0f39a 100644 --- a/config/rootfiles/common/armv6l/glibc +++ b/config/rootfiles/common/armv6l/glibc @@ -2,7 +2,6 @@ etc/rpc lib/ld-linux.so.3 lib/libBrokenLocale.so.1 -#lib/libSegFault.so lib/libanl.so.1 lib/libc.so.6 #lib/libc_malloc_debug.so.0 @@ -23,11 +22,11 @@ lib/libthread_db.so.1 lib/libutil.so.1 sbin/ldconfig #sbin/sln -#usr/bin/catchsegv #usr/bin/gencat usr/bin/getconf usr/bin/getent #usr/bin/iconv +usr/bin/ld.so usr/bin/ldd usr/bin/locale #usr/bin/localedef @@ -58,12 +57,14 @@ usr/bin/locale #usr/include/bits #usr/include/bits/a.out.h #usr/include/bits/argp-ldbl.h +#usr/include/bits/atomic_wide_counter.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h #usr/include/bits/cpu-set.h #usr/include/bits/dirent.h #usr/include/bits/dirent_ext.h +#usr/include/bits/dl_find_object.h #usr/include/bits/dlfcn.h #usr/include/bits/elfclass.h #usr/include/bits/endian.h @@ -101,6 +102,7 @@ usr/bin/locale #usr/include/bits/libc-header-start.h #usr/include/bits/libm-simd-decl-stubs.h #usr/include/bits/link.h +#usr/include/bits/link_lavcurrent.h #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/long-double.h @@ -135,6 +137,7 @@ usr/bin/locale #usr/include/bits/pthreadtypes.h #usr/include/bits/ptrace-shared.h #usr/include/bits/resource.h +#usr/include/bits/rseq.h #usr/include/bits/sched.h #usr/include/bits/select.h #usr/include/bits/select2.h @@ -452,6 +455,7 @@ usr/bin/locale #usr/include/sys/raw.h #usr/include/sys/reboot.h #usr/include/sys/resource.h +#usr/include/sys/rseq.h #usr/include/sys/select.h #usr/include/sys/sem.h #usr/include/sys/sendfile.h @@ -809,6 +813,20 @@ usr/lib/gconv #usr/lib/libthread_db.so #usr/lib/libutil.a usr/lib/locale +#usr/lib/locale/C.utf8 +#usr/lib/locale/C.utf8/LC_ADDRESS +#usr/lib/locale/C.utf8/LC_COLLATE +#usr/lib/locale/C.utf8/LC_CTYPE +#usr/lib/locale/C.utf8/LC_IDENTIFICATION +#usr/lib/locale/C.utf8/LC_MEASUREMENT +#usr/lib/locale/C.utf8/LC_MESSAGES +#usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/C.utf8/LC_MONETARY +#usr/lib/locale/C.utf8/LC_NAME +#usr/lib/locale/C.utf8/LC_NUMERIC +#usr/lib/locale/C.utf8/LC_PAPER +#usr/lib/locale/C.utf8/LC_TELEPHONE +#usr/lib/locale/C.utf8/LC_TIME #usr/lib/locale/aa_DJ #usr/lib/locale/aa_DJ.utf8 #usr/lib/locale/aa_DJ.utf8/LC_ADDRESS @@ -7880,11 +7898,13 @@ usr/lib/locale #usr/share/i18n/charmaps/VISCII.gz #usr/share/i18n/charmaps/WINDOWS-31J.gz #usr/share/i18n/locales +#usr/share/i18n/locales/C #usr/share/i18n/locales/POSIX #usr/share/i18n/locales/aa_DJ #usr/share/i18n/locales/aa_ER #usr/share/i18n/locales/aa_ER@saaho #usr/share/i18n/locales/aa_ET +#usr/share/i18n/locales/ab_GE #usr/share/i18n/locales/af_ZA #usr/share/i18n/locales/agr_PE #usr/share/i18n/locales/ak_GH @@ -8246,6 +8266,7 @@ usr/lib/locale #usr/share/info/libc.info-15 #usr/share/info/libc.info-16 #usr/share/info/libc.info-17 +#usr/share/info/libc.info-18 #usr/share/info/libc.info-2 #usr/share/info/libc.info-3 #usr/share/info/libc.info-4 diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc index 40bd175f4..5014f8a88 100644 --- a/config/rootfiles/common/x86_64/glibc +++ b/config/rootfiles/common/x86_64/glibc @@ -2,7 +2,6 @@ etc/rpc lib/ld-linux-x86-64.so.2 lib/libBrokenLocale.so.1 -#lib/libSegFault.so lib/libanl.so.1 lib/libc.so.6 #lib/libc_malloc_debug.so.0 @@ -24,11 +23,11 @@ lib/libthread_db.so.1 lib/libutil.so.1 sbin/ldconfig #sbin/sln -#usr/bin/catchsegv #usr/bin/gencat usr/bin/getconf usr/bin/getent #usr/bin/iconv +usr/bin/ld.so usr/bin/ldd usr/bin/locale #usr/bin/localedef @@ -59,12 +58,14 @@ usr/bin/locale #usr/include/bits #usr/include/bits/a.out.h #usr/include/bits/argp-ldbl.h +#usr/include/bits/atomic_wide_counter.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h #usr/include/bits/cpu-set.h #usr/include/bits/dirent.h #usr/include/bits/dirent_ext.h +#usr/include/bits/dl_find_object.h #usr/include/bits/dlfcn.h #usr/include/bits/elfclass.h #usr/include/bits/endian.h @@ -102,6 +103,7 @@ usr/bin/locale #usr/include/bits/libc-header-start.h #usr/include/bits/libm-simd-decl-stubs.h #usr/include/bits/link.h +#usr/include/bits/link_lavcurrent.h #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/long-double.h @@ -138,6 +140,7 @@ usr/bin/locale #usr/include/bits/pthreadtypes.h #usr/include/bits/ptrace-shared.h #usr/include/bits/resource.h +#usr/include/bits/rseq.h #usr/include/bits/sched.h #usr/include/bits/select.h #usr/include/bits/select2.h @@ -461,6 +464,7 @@ usr/bin/locale #usr/include/sys/reboot.h #usr/include/sys/reg.h #usr/include/sys/resource.h +#usr/include/sys/rseq.h #usr/include/sys/select.h #usr/include/sys/sem.h #usr/include/sys/sendfile.h @@ -793,6 +797,7 @@ usr/lib/gconv #usr/lib/glibc/getconf/POSIX_V6_LP64_OFF64 #usr/lib/glibc/getconf/POSIX_V7_LP64_OFF64 #usr/lib/glibc/getconf/XBS5_LP64_OFF64 +#usr/lib/grcrt1.o #usr/lib/libBrokenLocale.a #usr/lib/libBrokenLocale.so #usr/lib/libanl.a @@ -803,7 +808,7 @@ usr/lib/gconv #usr/lib/libc_nonshared.a #usr/lib/libdl.a #usr/lib/libg.a -#usr/lib/libm-2.34.a +#usr/lib/libm-2.35.a #usr/lib/libm.a #usr/lib/libm.so #usr/lib/libmcheck.a @@ -819,6 +824,20 @@ usr/lib/gconv #usr/lib/libthread_db.so #usr/lib/libutil.a usr/lib/locale +#usr/lib/locale/C.utf8 +#usr/lib/locale/C.utf8/LC_ADDRESS +#usr/lib/locale/C.utf8/LC_COLLATE +#usr/lib/locale/C.utf8/LC_CTYPE +#usr/lib/locale/C.utf8/LC_IDENTIFICATION +#usr/lib/locale/C.utf8/LC_MEASUREMENT +#usr/lib/locale/C.utf8/LC_MESSAGES +#usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/C.utf8/LC_MONETARY +#usr/lib/locale/C.utf8/LC_NAME +#usr/lib/locale/C.utf8/LC_NUMERIC +#usr/lib/locale/C.utf8/LC_PAPER +#usr/lib/locale/C.utf8/LC_TELEPHONE +#usr/lib/locale/C.utf8/LC_TIME #usr/lib/locale/aa_DJ #usr/lib/locale/aa_DJ.utf8 #usr/lib/locale/aa_DJ.utf8/LC_ADDRESS @@ -7651,6 +7670,7 @@ usr/lib/locale #usr/lib/locale/zu_ZA/LC_PAPER #usr/lib/locale/zu_ZA/LC_TELEPHONE #usr/lib/locale/zu_ZA/LC_TIME +#usr/lib/rcrt1.o #usr/sbin/iconvconfig #usr/sbin/nscd #usr/sbin/zic @@ -7890,11 +7910,13 @@ usr/lib/locale #usr/share/i18n/charmaps/VISCII.gz #usr/share/i18n/charmaps/WINDOWS-31J.gz #usr/share/i18n/locales +#usr/share/i18n/locales/C #usr/share/i18n/locales/POSIX #usr/share/i18n/locales/aa_DJ #usr/share/i18n/locales/aa_ER #usr/share/i18n/locales/aa_ER@saaho #usr/share/i18n/locales/aa_ET +#usr/share/i18n/locales/ab_GE #usr/share/i18n/locales/af_ZA #usr/share/i18n/locales/agr_PE #usr/share/i18n/locales/ak_GH @@ -8256,6 +8278,7 @@ usr/lib/locale #usr/share/info/libc.info-15 #usr/share/info/libc.info-16 #usr/share/info/libc.info-17 +#usr/share/info/libc.info-18 #usr/share/info/libc.info-2 #usr/share/info/libc.info-3 #usr/share/info/libc.info-4 @@ -8376,7 +8399,5 @@ usr/lib/locale #usr/share/locale/zh_TW #usr/share/locale/zh_TW/LC_MESSAGES #usr/share/locale/zh_TW/LC_MESSAGES/libc.mo -#var/cache/ldconfig -#var/cache/ldconfig/aux-cache #var/db #var/db/Makefile diff --git a/lfs/glibc b/lfs/glibc index 685e56e97..3a61613eb 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -24,7 +24,7 @@
include Config
-VER = 2.34 +VER = 2.35
THISAPP = glibc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,9 +46,7 @@ else --host=$(CROSSTARGET) \ --build=$(BUILDTARGET) \ --prefix=$(TOOLS_DIR) \ - --with-headers=$(TOOLS_DIR)/include \ - libc_cv_forced_unwind=yes \ - libc_cv_c_cleanup=yes + --with-headers=$(TOOLS_DIR)/include endif
ifeq "$(BUILD_ARCH)" "aarch64" @@ -81,7 +79,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 31998b53fb39cb946e96abc310af1c89 +$(DL_FILE)_MD5 = dd571c67d85d89d7f60b854a4e207423
install : $(TARGET)