mirror of
https://github.com/openwrt/packages.git
synced 2025-01-31 04:51:44 +00:00
c3e2dcc128
GCC now does not allow assigning an std::locale to an std::string. No idea why it worked originally. Also fixed compilation with full NLS. Signed-off-by: Rosen Penev <rosenp@gmail.com>
33 lines
1016 B
Diff
33 lines
1016 B
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -310,6 +310,8 @@ include_directories(${PROJECT_BINARY_DIR
|
|
${PROJECT_BINARY_DIR}
|
|
${PROJECT_SOURCE_DIR})
|
|
|
|
+find_package(Intl)
|
|
+
|
|
add_subdirectory(sbuild)
|
|
add_subdirectory(bin)
|
|
add_subdirectory(etc)
|
|
--- a/sbuild/CMakeLists.txt
|
|
+++ b/sbuild/CMakeLists.txt
|
|
@@ -208,6 +208,7 @@ add_library(sbuild STATIC
|
|
${public_chroot_facet_cc_sources})
|
|
target_link_libraries(sbuild
|
|
PRIVATE
|
|
+ Intl::Intl
|
|
${CMAKE_THREAD_LIBS_INIT}
|
|
${PAM_LIBRARY}
|
|
${UUID_LIBRARY}
|
|
--- a/sbuild/sbuild-basic-keyfile.tcc
|
|
+++ b/sbuild/sbuild-basic-keyfile.tcc
|
|
@@ -214,7 +214,7 @@ sbuild::basic_keyfile<K, P>::get_locale_
|
|
}
|
|
catch (std::runtime_error const& e) // Invalid locale
|
|
{
|
|
- localename = std::locale::classic();
|
|
+ localename = std::locale::classic().name();
|
|
}
|
|
std::string::size_type pos;
|
|
bool status = false;
|