Browse Source

fix build, remove dev warnings

Waldemar Brodkorb 11 years ago
parent
commit
02ac72d251
2 changed files with 4 additions and 4 deletions
  1. 1 1
      mk/pkg-bottom.mk
  2. 3 3
      package/mysql/Makefile

+ 1 - 1
mk/pkg-bottom.mk

@@ -67,7 +67,7 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),)
 		-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 \
+		cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 			-DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \
 			${CMAKE_FLAGS} ${WRKSRC})
 else ifneq ($(filter minimal,${CONFIG_STYLE}),)

+ 3 - 3
package/mysql/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a663c5b3c710043c74f97902a1ed62c0
 PKG_DESCR:=		mysql client library
 PKG_SECTION:=		libs/db
-PKG_DEPENDS:=		libncurses zlib
-PKG_BUILDDEP:=		cmake-host mysql-host ncurses zlib readline
+PKG_DEPENDS:=		libncurses zlib libevent
+PKG_BUILDDEP:=		cmake-host mysql-host ncurses zlib readline libevent
 HOST_BUILDDEP:=		cmake-host
 PKG_URL:=		http://www.mysql.com/
 PKG_SITES=		${MASTER_SITE_MYSQL:=Downloads/MySQL-5.6/}
@@ -30,7 +30,7 @@ CONFIG_STYLE:=		cmake
 CMAKE_FLAGS+=		-DSTACK_DIRECTION=1 \
 			-DWITH_EDITLINE=bundled \
 			-DCURSES_LIBRARY="$(STAGING_TARGET_DIR)/usr/lib" \
-			-DCURSES_INCLUDE_PATH="$(STAGING_TARGET_DIR)/usr/lib"
+			-DCURSES_INCLUDE_PATH="$(STAGING_TARGET_DIR)/usr/include"
 
 host-configure:
 	cd ${WRKBUILD} && PATH='${HOST_PATH}' \