diff options
Diffstat (limited to 'repo/core/glibc.xibuild')
| -rw-r--r-- | repo/core/glibc.xibuild | 57 |
1 files changed, 12 insertions, 45 deletions
diff --git a/repo/core/glibc.xibuild b/repo/core/glibc.xibuild index 434cc02..290cb45 100644 --- a/repo/core/glibc.xibuild +++ b/repo/core/glibc.xibuild @@ -9,6 +9,10 @@ build () { # patches as recommended by lfs sed -e '/NOTIFY_REMOVED)/s/)/ \&\& data.attr != NULL)/' -i sysdeps/unix/sysv/linux/mq_notify.c + curl https://www.linuxfromscratch.org/patches/lfs/development/glibc-2.34-fhs-1.patch > glibc-2.34-fhs-1.patch + + patch -Np1 -i glibc-2.34-fhs-1.patch + mkdir -v build cd build @@ -24,13 +28,13 @@ build () { make - # these tests are vital, do not skip - # make check + # some check failures are 'expected' + make check || true } package () { - touch /etc/ld.so.conf + touch $PKG_DEST/etc/ld.so.conf sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile make DESTDIR=$PKG_DEST install @@ -44,43 +48,6 @@ package () { # create locales for the system # note, this should be moved to a better place - mkdir -pv $PKG_DEST/usr/lib/locale - localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true - localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8 - localedef -i de_DE -f ISO-8859-1 de_DE - localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro - localedef -i de_DE -f UTF-8 de_DE.UTF-8 - localedef -i el_GR -f ISO-8859-7 el_GR - localedef -i en_GB -f ISO-8859-1 en_GB - localedef -i en_GB -f UTF-8 en_GB.UTF-8 - localedef -i en_HK -f ISO-8859-1 en_HK - localedef -i en_PH -f ISO-8859-1 en_PH - localedef -i en_US -f ISO-8859-1 en_US - localedef -i en_US -f UTF-8 en_US.UTF-8 - localedef -i es_ES -f ISO-8859-15 es_ES@euro - localedef -i es_MX -f ISO-8859-1 es_MX - localedef -i fa_IR -f UTF-8 fa_IR - localedef -i fr_FR -f ISO-8859-1 fr_FR - localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro - localedef -i fr_FR -f UTF-8 fr_FR.UTF-8 - localedef -i is_IS -f ISO-8859-1 is_IS - localedef -i is_IS -f UTF-8 is_IS.UTF-8 - localedef -i it_IT -f ISO-8859-1 it_IT - localedef -i it_IT -f ISO-8859-15 it_IT@euro - localedef -i it_IT -f UTF-8 it_IT.UTF-8 - localedef -i ja_JP -f EUC-JP ja_JP - localedef -i ja_JP -f SHIFT_JIS ja_JP.SIJS 2> /dev/null || true - localedef -i ja_JP -f UTF-8 ja_JP.UTF-8 - localedef -i nl_NL@euro -f ISO-8859-15 nl_NL@euro - localedef -i ru_RU -f KOI8-R ru_RU.KOI8-R - localedef -i ru_RU -f UTF-8 ru_RU.UTF-8 - localedef -i se_NO -f UTF-8 se_NO.UTF-8 - localedef -i ta_IN -f UTF-8 ta_IN.UTF-8 - localedef -i tr_TR -f UTF-8 tr_TR.UTF-8 - localedef -i zh_CN -f GB18030 zh_CN.GB18030 - localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS - localedef -i zh_TW -f UTF-8 zh_TW.UTF-8 - make DESTDIR=$PKG_DEST localedata/install-locales cat > $PKG_DEST/etc/nsswitch.conf << "EOF" @@ -100,6 +67,11 @@ rpc: files # End /etc/nsswitch.conf EOF + + curl https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/glibc/trunk/locale-gen > locale-gen + + install -m755 locale-gen "$PKG_DEST/usr/bin" + #curl https://data.iana.org/time-zones/releases/tzdata2021e.tar.gz > tzdata2021e.tar.gz #tar -xf tzdata2021e.tar.gz # @@ -123,12 +95,7 @@ EOF # Begin /etc/ld.so.conf /usr/local/lib /opt/lib -EOF - - cat >> $PKG_DEST/etc/ld.so.conf << "EOF" -# Add an include directory include /etc/ld.so.conf.d/*.conf - EOF mkdir -pv $PKG_DEST/etc/ld.so.conf.d } |