Message ID | 20210924160345.1994773-1-fontaine.fabrice@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/log4cxx: fix build without wchar | expand |
On 24/09/2021 18:03, Fabrice Fontaine wrote: > Fix the following build failure without wchar raised since bump to > version 0.12.0 in commit 83a0e8dea203dc37c6c207a36b3f46160578dcc2: > > /home/buildroot/autobuild/instance-0/output-1/build/log4cxx-0.12.0/src/main/include/log4cxx/helpers/transcoder.h:113:33: error: 'wstring' in namespace 'std' does not name a type > 113 | static void decode(const std::wstring& src, LogString& dst); > | ^~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/7d0297b071df06bc312b9927396021aa6fe401f4 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/log4cxx/log4cxx.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk > index 49f4667a9a..8a7ca8ef17 100644 > --- a/package/log4cxx/log4cxx.mk > +++ b/package/log4cxx/log4cxx.mk > @@ -21,4 +21,10 @@ ifeq ($(BR2_PACKAGE_LIBESMTP),y) > LOG4CXX_DEPENDENCIES += libesmtp > endif > > +ifeq ($(BR2_USE_WCHAR),y) > +LOG4CXX_CONF_OPTS += -DLOG4CXX_WCHAR_T=ON > +else > +LOG4CXX_CONF_OPTS += -DLOG4CXX_WCHAR_T=OFF > +endif > + > $(eval $(cmake-package)) >
diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index 49f4667a9a..8a7ca8ef17 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -21,4 +21,10 @@ ifeq ($(BR2_PACKAGE_LIBESMTP),y) LOG4CXX_DEPENDENCIES += libesmtp endif +ifeq ($(BR2_USE_WCHAR),y) +LOG4CXX_CONF_OPTS += -DLOG4CXX_WCHAR_T=ON +else +LOG4CXX_CONF_OPTS += -DLOG4CXX_WCHAR_T=OFF +endif + $(eval $(cmake-package))
Fix the following build failure without wchar raised since bump to version 0.12.0 in commit 83a0e8dea203dc37c6c207a36b3f46160578dcc2: /home/buildroot/autobuild/instance-0/output-1/build/log4cxx-0.12.0/src/main/include/log4cxx/helpers/transcoder.h:113:33: error: 'wstring' in namespace 'std' does not name a type 113 | static void decode(const std::wstring& src, LogString& dst); | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7d0297b071df06bc312b9927396021aa6fe401f4 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/log4cxx/log4cxx.mk | 6 ++++++ 1 file changed, 6 insertions(+)