Diff of /smage/trunk/core/glibc/glibc-2.36-r1.smage2

Parent Directory | Revision Log | Patch

	revision 15650 by niro, Sun Dec 18 20:03:00 2022 UTC	revision 15654 by niro, Mon Dec 19 08:45:57 2022 UTC
#	Line 292  src_install_glibc()	Line 292  src_install_glibc()
292	# want to be safe here; --strip-unneeded seems to cause pthread problems	# want to be safe here; --strip-unneeded seems to cause pthread problems
293	# strip all but libpthread, libc and ld	# strip all but libpthread, libc and ld
294	install -d ${BUILDDIR}/thread-backup/$(mlibdir) || die	install -d ${BUILDDIR}/thread-backup/$(mlibdir) || die
295	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
296	mv ${BINDIR}/usr/$(mlibdir)/ld-* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die	mv ${BINDIR}/usr/$(mlibdir)/ld-* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die
297	if [[ ${ARCH} = x86_64 ]]	if [[ ${ARCH} = x86_64 ]]
298	then	then
299	install -d ${BUILDDIR}/thread-backup/lib || die	install -d ${BUILDDIR}/thread-backup/lib || die
300	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
301	mv ${BINDIR}/usr/lib/ld-* ${BUILDDIR}/thread-backup/lib/ || die	mv ${BINDIR}/usr/lib/ld-* ${BUILDDIR}/thread-backup/lib/ || die
302	fi	fi
303
#	Line 417  src_install_glibc-locale-de()	Line 417  src_install_glibc-locale-de()
417
418	# create locale-archive	# create locale-archive
419	minstalldir /usr/$(mlibdir)/locale || die	minstalldir /usr/$(mlibdir)/locale || die
420	locale/localedef \	#locale/localedef
421		localedef \
422	--prefix=${BINDIR} \	--prefix=${BINDIR} \
423	--inputfile=../localedata/locales/de_DE \	--inputfile=../localedata/locales/de_DE \
424	--charmap=../localedata/charmaps/UTF-8 \	--charmap=../localedata/charmaps/UTF-8 \
#	Line 427  src_install_glibc-locale-de()	Line 428  src_install_glibc-locale-de()
428	|| die	|| die
429
430	# test locale-archive	# test locale-archive
431	[[ $(locale/localedef --prefix=${BINDIR} --list-archive) = de_DE.utf8 ]] || die	#[[ $(locale/localedef --prefix=${BINDIR} --list-archive) = de_DE.utf8 ]] || die
432		[[ $(localedef --prefix=${BINDIR} --list-archive) = de_DE.utf8 ]] || die
433	}	}
434
435	src_install_glibc-locale-us()	src_install_glibc-locale-us()
#	Line 436  src_install_glibc-locale-us()	Line 438  src_install_glibc-locale-us()
438
439	# create locale-archive	# create locale-archive
440	minstalldir /usr/$(mlibdir)/locale || die	minstalldir /usr/$(mlibdir)/locale || die
441	locale/localedef \	#locale/localedef
442		localedef \
443	--prefix=${BINDIR} \	--prefix=${BINDIR} \
444	--inputfile=../localedata/locales/en_US \	--inputfile=../localedata/locales/en_US \
445	--charmap=../localedata/charmaps/UTF-8 \	--charmap=../localedata/charmaps/UTF-8 \
#	Line 446  src_install_glibc-locale-us()	Line 449  src_install_glibc-locale-us()
449	|| die	|| die
450
451	# test locale-archive	# test locale-archive
452	[[ $(locale/localedef --prefix=${BINDIR} --list-archive) = en_US.utf8 ]] || die	#[[ $(locale/localedef --prefix=${BINDIR} --list-archive) = en_US.utf8 ]] || die
453		[[ $(localedef --prefix=${BINDIR} --list-archive) = en_US.utf8 ]] || die
454	}	}
455
456	fix_db_files()	fix_db_files()

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.15650   changed lines   Added in v.15654