--- smage/trunk/core/glibc/glibc-2.36-r1.smage2 2022/12/18 20:03:00 15650 +++ smage/trunk/core/glibc/glibc-2.36-r1.smage2 2022/12/19 08:45:57 15654 @@ -292,12 +292,12 @@ # want to be safe here; --strip-unneeded seems to cause pthread problems # strip all but libpthread, libc and ld install -d ${BUILDDIR}/thread-backup/$(mlibdir) || die - mv ${BINDIR}/usr/$(mlibdir)/lib{pthread,thread_db,c-}* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die + mv ${BINDIR}/usr/$(mlibdir)/lib{pthread,thread_db,c.}* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die mv ${BINDIR}/usr/$(mlibdir)/ld-* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die if [[ ${ARCH} = x86_64 ]] then install -d ${BUILDDIR}/thread-backup/lib || die - mv ${BINDIR}/usr/lib/lib{pthread,thread_db,c-}* ${BUILDDIR}/thread-backup/lib/ || die + mv ${BINDIR}/usr/lib/lib{pthread,thread_db,c.}* ${BUILDDIR}/thread-backup/lib/ || die mv ${BINDIR}/usr/lib/ld-* ${BUILDDIR}/thread-backup/lib/ || die fi @@ -417,7 +417,8 @@ # create locale-archive minstalldir /usr/$(mlibdir)/locale || die - locale/localedef \ + #locale/localedef + localedef \ --prefix=${BINDIR} \ --inputfile=../localedata/locales/de_DE \ --charmap=../localedata/charmaps/UTF-8 \ @@ -427,7 +428,8 @@ || die # test locale-archive - [[ $(locale/localedef --prefix=${BINDIR} --list-archive) = de_DE.utf8 ]] || die + #[[ $(locale/localedef --prefix=${BINDIR} --list-archive) = de_DE.utf8 ]] || die + [[ $(localedef --prefix=${BINDIR} --list-archive) = de_DE.utf8 ]] || die } src_install_glibc-locale-us() @@ -436,7 +438,8 @@ # create locale-archive minstalldir /usr/$(mlibdir)/locale || die - locale/localedef \ + #locale/localedef + localedef \ --prefix=${BINDIR} \ --inputfile=../localedata/locales/en_US \ --charmap=../localedata/charmaps/UTF-8 \ @@ -446,7 +449,8 @@ || die # test locale-archive - [[ $(locale/localedef --prefix=${BINDIR} --list-archive) = en_US.utf8 ]] || die + #[[ $(locale/localedef --prefix=${BINDIR} --list-archive) = en_US.utf8 ]] || die + [[ $(localedef --prefix=${BINDIR} --list-archive) = en_US.utf8 ]] || die } fix_db_files()