luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pymod' of https://github.com/klayoutmatthias/klayout into pymod

This commit is contained in:
Daniel Wang 2018-07-19 13:40:57 -04:00
parent 182517dbf9 aca209c095
commit ad1ada9b23
No known key found for this signature in database
GPG Key ID: 82968CE7F0EA634E
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@ -127,7 +127,11 @@ class Config(object):
# build path and the loader will fail. # build path and the loader will fail.
args = [] args = []
args += ['-Wl,-soname,' + self.libname_of(mod)] args += ['-Wl,-soname,' + self.libname_of(mod)]
args += ['-Wl,-rpath,$ORIGIN'] if not '_dbpi' in mod:
loader_path = '$ORIGIN'
else:
loader_path = '$ORIGIN/..'
args += ['-Wl,-rpath,' + loader_path]
return args return args
def macros(self): def macros(self):

8
src/tl/unit_tests/tlString.cc
View File

@ -484,9 +484,13 @@ TEST(14)
// UTF-8 to wchar_t and local conversion // UTF-8 to wchar_t and local conversion
TEST(15) TEST(15)
{ {
// NOTE: we don't know the local setting, but translation back and forth should work.
std::string locale = setlocale (LC_ALL, NULL); std::string locale = setlocale (LC_ALL, NULL);
setlocale (LC_ALL, "en_US.UTF-8"); const char *lc = setlocale (LC_ALL, "en_US.UTF-8");
if (! lc || std::string (lc) != "en_US.UTF-8") {
// use C.UTF-8 as fallback
setlocale (LC_ALL, "C.UTF-8");
}
try { try {
EXPECT_EQ (tl::to_string_from_local (tl::to_local ("Hällo\tWörld!").c_str ()), "Hällo\tWörld!"); EXPECT_EQ (tl::to_string_from_local (tl::to_local ("Hällo\tWörld!").c_str ()), "Hällo\tWörld!");
setlocale (LC_ALL, locale.c_str ()); setlocale (LC_ALL, locale.c_str ());