From 772bcabf7a45ba383561df3a479d6e29d2381dfb Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 14 Jan 2022 19:08:31 +0100 Subject: [PATCH] Revert "sqlite: enable ICU support" This reverts commit 537c0e2b4b5c12c298d9e6c776feb4cdc3118dcc. --- packages/{textproc => addons/addon-depends}/icu/package.mk | 2 ++ .../addon-depends}/icu/patches/icu-01_ldflags.patch | 0 packages/databases/sqlite/package.mk | 6 +----- 3 files changed, 3 insertions(+), 5 deletions(-) rename packages/{textproc => addons/addon-depends}/icu/package.mk (97%) rename packages/{textproc => addons/addon-depends}/icu/patches/icu-01_ldflags.patch (100%) diff --git a/packages/textproc/icu/package.mk b/packages/addons/addon-depends/icu/package.mk similarity index 97% rename from packages/textproc/icu/package.mk rename to packages/addons/addon-depends/icu/package.mk index ceb558599d..ed9d30f935 100644 --- a/packages/textproc/icu/package.mk +++ b/packages/addons/addon-depends/icu/package.mk @@ -12,6 +12,8 @@ PKG_DEPENDS_TARGET="toolchain icu:host" PKG_LONGDESC="International Components for Unicode library." PKG_TOOLCHAIN="configure" +PKG_BUILD_FLAGS="-sysroot" + configure_package() { PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/icu4c/source/configure" PKG_CONFIGURE_OPTS_TARGET="--disable-layout \ diff --git a/packages/textproc/icu/patches/icu-01_ldflags.patch b/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch similarity index 100% rename from packages/textproc/icu/patches/icu-01_ldflags.patch rename to packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk index 4d4dfd9221..1e99c805ff 100644 --- a/packages/databases/sqlite/package.mk +++ b/packages/databases/sqlite/package.mk @@ -10,7 +10,7 @@ PKG_LICENSE="PublicDomain" PKG_SITE="https://www.sqlite.org/" PKG_URL="https://www.sqlite.org/2021/${PKG_NAME}-autoconf-${PKG_VERSION_SQLITE/./0}.tar.gz" PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host" -PKG_DEPENDS_TARGET="toolchain ncurses icu" +PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="An Embeddable SQL Database Engine." # libsqlite3.a(sqlite3.o): requires dynamic R_X86_64_PC32 reloc against 'sqlite3_stricmp' which may overflow at runtime PKG_BUILD_FLAGS="+pic +pic:host -parallel" @@ -53,8 +53,4 @@ pre_configure_target() { # sqlite3_config(SQLITE_CONFIG_MMAP_SIZE) call, or at run-time using the # mmap_size pragma. CFLAGS+=" -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456" - -# Enable ICU support. -# This make case insensitive like statement for non ASCII characters. - CFLAGS+=" -DSQLITE_ENABLE_ICU -licuio -licui18n -licuuc -licudata" }