D31429.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31429.diff
View Options

	diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
	--- a/ObsoleteFiles.inc
	+++ b/ObsoleteFiles.inc
	@@ -40,6 +40,9 @@
	# xargs -n1 \| sort \| uniq -d;
	# done

	+# 20210805: C.UTF-8 installed to the wrong location
	+OLD_FILES+=usr/share/C.UTF-8.LC_CTYPE
	+
	# 20210619: new clang import which bumps version from 12.0.0 to 12.0.1.
	OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/algorithm
	OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/complex
	diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
	--- a/share/ctypedef/Makefile
	+++ b/share/ctypedef/Makefile
	@@ -5,6 +5,7 @@
	ALWAYSPACKAGE= runtime
	LOCALEDIR= ${SHAREDIR}/locale
	FILESNAME= LC_CTYPE
	+ALWAYSNAME= LC_CTYPE
	.SUFFIXES: .src .LC_CTYPE
	MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps

	@@ -231,7 +232,7 @@
	.for f in ${LOCALES}
	FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f}
	.endfor
	-FILESDIR_C.UTF-8.LC_CTYPEPACKAGE= runtime
	+ALWAYSDIR_C.UTF-8.LC_CTYPE= ${LOCALEDIR}/C.UTF-8

	SYMPAIRS+= zh_CN.eucCN.src zh_CN.GB18030.src
	SYMPAIRS+= zh_CN.eucCN.src zh_CN.GB2312.src