Skip to content

Commit

Permalink
update sdcv to support non-fuzzy-fallback option
Browse files Browse the repository at this point in the history
  • Loading branch information
chrox authored and Frenzie committed Jun 13, 2017
1 parent 48a2ff5 commit 4cecbef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
3 changes: 0 additions & 3 deletions Makefile.third
Expand Up @@ -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) && \
Expand Down
8 changes: 2 additions & 6 deletions thirdparty/sdcv/CMakeLists.txt
Expand Up @@ -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}\"")
Expand All @@ -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}
)

Expand Down

0 comments on commit 4cecbef

Please sign in to comment.