From 1d3eac1e033e3d333d29ea1f32ab9f2b1d11e3f5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 26 Jun 2014 11:29:20 +0200 Subject: add CONFIG_STYLE for cmake based packages, fixup cmake host install --- package/mysql/Makefile | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'package/mysql') diff --git a/package/mysql/Makefile b/package/mysql/Makefile index 8e05b9d94..b69d71296 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -26,7 +26,7 @@ $(eval $(call HOST_template,MYSQL,mysql,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) HOST_STYLE:= manual -CONFIG_STYLE:= manual +CONFIG_STYLE:= cmake host-configure: cd ${WRKBUILD} && PATH='${HOST_PATH}' \ @@ -49,22 +49,7 @@ mysql-hostinstall: $(INSTALL_BIN) ${WRKBUILD}/storage/perfschema/gen_pfs_lex_token \ $(STAGING_HOST_DIR)/usr/bin -do-configure: - sed -e "s#@@TARGET_CC@@#$(TARGET_CC)#" \ - -e "s#@@TARGET_CXX@@#$(TARGET_CXX)#" \ - -e "s#@@TARGET_CFLAGS@@#$(TARGET_CFLAGS)#" \ - -e "s#@@TARGET_CXXFLAGS@@#$(TARGET_CXXFLAGS)#" \ - -e "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" \ - -e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" \ - $(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake - (cd ${WRKBUILD} && PATH='${HOST_PATH}' \ - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \ - -DWITH_EDITLINE=bundled \ - -DCURSES_LIBRARY="$(STAGING_TARGET_DIR)/usr/lib" \ - -DCURSES_INCLUDE_PATH="$(STAGING_TARGET_DIR)/usr/lib" \ - -DSTACK_DIRECTION=1 \ - .) +post-configure: $(CP) $(STAGING_HOST_DIR)/usr/bin/comp_err \ ${WRKBUILD}/extra/ $(CP) $(STAGING_HOST_DIR)/usr/bin/comp_sql \ -- cgit v1.2.3