summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-28 07:28:09 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-28 07:28:28 (GMT)
commit02ac72d2519d82b4463f0ea177895f2562eb1c76 (patch)
tree1a20ddf5b3bcb87a744ece70bfeae6bf0c665982
parentb38ddb748be02e1a8d340520c50819f15a78a30c (diff)
fix build, remove dev warnings
-rw-r--r--mk/pkg-bottom.mk2
-rw-r--r--package/mysql/Makefile6
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 1b0aeed..d816167 100644
--- a/mk/pkg-bottom.mk
+++ b/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}),)
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 0a5cd9c..830dcfb 100644
--- a/package/mysql/Makefile
+++ b/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}' \