From 4cecbeffc5089972fb7410d952bd8035c1b6007d Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 13 Jun 2017 23:02:58 +0800 Subject: [PATCH] update sdcv to support non-fuzzy-fallback option --- Makefile.third | 3 --- thirdparty/sdcv/CMakeLists.txt | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile.third b/Makefile.third index a1bb3cbbb..b6f79136c 100644 --- a/Makefile.third +++ b/Makefile.third @@ -285,9 +285,6 @@ endif # =========================================================================== # console version of StarDict(sdcv) -ifeq ("$(shell PATH='$(PATH)' $(CC) -dumpmachine | sed s/-.*//)","x86_64") -PAGE_SIZE_CFG=-D64BIT_PAGE:BOOL=on -endif $(OUTPUT_DIR)/sdcv: $(if $(ANDROID),$(GLIB_STATIC),$(GLIB)) $(ZLIB_STATIC) $(THIRDPARTY_DIR)/sdcv/CMakeLists.txt install -d $(SDCV_BUILD_DIR) cd $(SDCV_BUILD_DIR) && \ diff --git a/thirdparty/sdcv/CMakeLists.txt b/thirdparty/sdcv/CMakeLists.txt index c3728d76f..a0ba331ac 100644 --- a/thirdparty/sdcv/CMakeLists.txt +++ b/thirdparty/sdcv/CMakeLists.txt @@ -16,11 +16,7 @@ assert_var_defined(HOST) ep_get_source_dir(SOURCE_DIR) -set(PATCH_CMD "${ISED} 's|-lz||' configure.ac") -if(DEFINED 64BIT_PAGE) - # quick fix for x86_64 (zeus) - set(PATCH_CMD "${PATCH_CMD} && ${ISED} 's|guint32 page_size|guint64 page_size|' src/lib/lib.cpp") -endif() +set(PATCH_CMD "${ISED} 's|-lz||' configure.ac && ${ISED} 's|-lz||' configure") set(PATCH_CMD sh -c "${PATCH_CMD}") set(CFG_OPTS "--host=\"${HOST}\" PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}\" CXX=\"${CXX}\" CXXFLAGS=\"${CXXFLAGS}\" LDFLAGS=\"${LDFLAGS}\" LIBS=\"${LIBS}\"") @@ -29,7 +25,7 @@ set(CFG_CMD sh -c "${SOURCE_DIR}/configure ${CFG_OPTS}") ko_write_gitclone_script( GIT_CLONE_SCRIPT_FILENAME git://github.com/koreader/sdcv.git - d1b85743ded5e99232aed59e84129a551bfc8c82 + 4455cf31bb4a424370e29d858dc07cf8d8f5de04 ${SOURCE_DIR} )