From f89b9153d8d994eeecdded8eea3517687aeac20b Mon Sep 17 00:00:00 2001 From: CvH Date: Wed, 24 Jun 2020 23:16:06 +0200 Subject: [PATCH] samba: disable automatic icu pickup if you build icu before samba, icu gets used at buildtime and fails --- packages/network/samba/package.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index b5cd9a6922..0b3b09d384 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -115,6 +115,13 @@ configure_target() { PYTHON=${TOOLCHAIN}/bin/python3 ./configure $PKG_CONFIGURE_OPTS } +# disable icu, there is no buildswitch to disable +pre_make_target() { + sed -e '/#define HAVE_ICU_I18N 1/d' \ + -e '/#define HAVE_LIBICUI.* 1/d' \ + -i bin/default/include/config.h +} + make_target() { ./buildtools/bin/waf build ${PKG_WAF_VERBOSE} --targets=$PKG_SAMBA_TARGET -j$CONCURRENCY_MAKE_LEVEL }