summaryrefslogtreecommitdiff
path: root/package/mysql
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
commit8e8512391c668fc7074f812f15eabe8f176fb01e (patch)
treef9f0862dd6eb962fe3fc4803180b431843f6c5be /package/mysql
parentc491653a1f9574a42965025805d472c3d145f699 (diff)
parentae3d4616ed9c19a29d656193254657f93d612fa2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/mysql')
-rw-r--r--package/mysql/Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 2d85c947a..365dea844 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mysql
PKG_VERSION:= 5.1.61
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 4efd10c69c4c99dbdb8fae3834a6d7b8
PKG_DESCR:= MySQL client library
PKG_SECTION:= db
@@ -13,14 +13,14 @@ PKG_DEPENDS:= libncurses zlib
PKG_BUILDDEP:= ncurses zlib readline
PKG_URL:= http://www.mysql.com/
PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/}
+PKG_LIBNAME:= libmysqlclient
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBMYSQLCLIENT LIBMYSQLCLIENT_DEV
PKG_HOST_DEPENDS:= !cygwin
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMYSQLCLIENT_DEV,libmysqlclient-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
@@ -91,11 +91,4 @@ libmysqlclient-install:
$(SED) "s,\(^pkgincludedir='\)\(.*\),\1${STAGING_TARGET_DIR}\2," \
${WRKINST}/usr/bin/mysql_config
-libmysqlclient-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMYSQLCLIENT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/mysql_config \
- ${IDIR_LIBMYSQLCLIENT_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk