From patchwork Fri Oct 17 14:25:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 400537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 24CBD1400BE for ; Sat, 18 Oct 2014 01:26:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 554899172F; Fri, 17 Oct 2014 14:26:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zOsWFSDRhLT4; Fri, 17 Oct 2014 14:26:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C31491EEE; Fri, 17 Oct 2014 14:26:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A4A5B1C20E2 for ; Fri, 17 Oct 2014 14:26:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9EDE191F56 for ; Fri, 17 Oct 2014 14:26:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RbReM36qPMlW for ; Fri, 17 Oct 2014 14:26:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [62.210.192.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 71BE291682 for ; Fri, 17 Oct 2014 14:26:06 +0000 (UTC) Received: from asgard (cpe-186-23-17-245.telecentro-reversos.com.ar [186.23.17.245] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.14.9/8.14.9) with ESMTP id s9HEPxck010526 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 17 Oct 2014 14:26:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1413555964; bh=2kA9kcBJdo4gYBw3rK6lh99mExpqTIws4YCrJgjg9TU=; h=From:To:Cc:Subject:Date; b=agQtZmdEXoAHel5fWXebU1ZWBK1jb/y07E/SYNLU2DDmlW0OYzJOTIVz2I5KXnwpf 6GhKyOlpv+S2fR5349vfT5nEJD3AKR7M3cgayKWwyu4OHmkzGhGdYcbik3S8qvOdYh IcIlE0NYRc5UK2/3/kzLJoOuwHpFUYDUxsCh5ZOU= Received: by asgard (sSMTP sendmail emulation); Fri, 17 Oct 2014 11:25:54 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 17 Oct 2014 11:25:54 -0300 Message-Id: <1413555954-30435-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.0.4 X-Virus-Scanned: clamav-milter 0.98.4 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] cppdb: enable postgresql support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also: Fix mysql support. Add hash file. Forcibly disable automatic db support when it's not selected. Signed-off-by: Gustavo Zacarias --- package/cppdb/Config.in | 4 ++-- .../cppdb/cppdb-0001-mysql-library-suffix.patch | 23 ++++++++++++++++++++++ package/cppdb/cppdb.hash | 3 +++ package/cppdb/cppdb.mk | 13 +++++++++++- 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 package/cppdb/cppdb-0001-mysql-library-suffix.patch create mode 100644 package/cppdb/cppdb.hash diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in index 120598a..19c9419 100644 --- a/package/cppdb/Config.in +++ b/package/cppdb/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CPPDB depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # Can be built without them but it's useless - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_SQLITE + depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE help CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API similarly @@ -14,6 +14,6 @@ config BR2_PACKAGE_CPPDB http://cppcms.com/sql/cppdb/ comment "cppdb needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_SQLITE + depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_PREFER_STATIC_LIB diff --git a/package/cppdb/cppdb-0001-mysql-library-suffix.patch b/package/cppdb/cppdb-0001-mysql-library-suffix.patch new file mode 100644 index 0000000..e65e3e2 --- /dev/null +++ b/package/cppdb/cppdb-0001-mysql-library-suffix.patch @@ -0,0 +1,23 @@ +Add mysql/ to PATH_SUFFIXES for the library search for mysql. + +On common distros libmysqlclient* is installed and/or symlinked +into /usr/lib. +Since we install the libraries into /usr/lib/mysql alone cppdb +fails to properly link to it giving runtime errors. + +Status: https://sourceforge.net/p/cppcms/bugs/135/ + +Signed-off-by: Gustavo Zacarias + +diff -Nura cppdb-0.3.1.orig/CMakeLists.txt cppdb-0.3.1/CMakeLists.txt +--- cppdb-0.3.1.orig/CMakeLists.txt 2014-10-17 11:05:57.875429748 -0300 ++++ cppdb-0.3.1/CMakeLists.txt 2014-10-17 11:12:57.486775484 -0300 +@@ -196,7 +196,7 @@ + endif() + + if(NOT DISABLE_MYSQL) +- find_library(MYSQL_LIB mysqlclient) ++ find_library(MYSQL_LIB mysqlclient PATH_SUFFIXES mysql) + find_path(MYSQL_PATH mysql.h PATH_SUFFIXES mysql) + if(MYSQL_LIB AND MYSQL_PATH) + include_directories(${MYSQL_PATH}) diff --git a/package/cppdb/cppdb.hash b/package/cppdb/cppdb.hash new file mode 100644 index 0000000..efc0eac --- /dev/null +++ b/package/cppdb/cppdb.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/cppcms/files/cppdb/0.3.1/ +md5 129f1d75f46114b79160b93807d5223f cppdb-0.3.1.tar.bz2 +sha1 c0410dcc482d71696ac9206044b3a3ac03d31f96 cppdb-0.3.1.tar.bz2 diff --git a/package/cppdb/cppdb.mk b/package/cppdb/cppdb.mk index f7f837e..2c26c90 100644 --- a/package/cppdb/cppdb.mk +++ b/package/cppdb/cppdb.mk @@ -14,7 +14,18 @@ CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt ifeq ($(BR2_PACKAGE_MYSQL),y) CPPDB_DEPENDENCIES += mysql -CPPDB_CONF_OPTS += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql +else +CPPDB_CONF_OPTS += -DDISABLE_MYSQL=ON +endif + +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +CPPDB_DEPENDENCIES += postgresql +else +CPPDB_CONF_OPTS += -DDISABLE_PQ=ON +endif + +ifeq ($(BR2_PACKAGE_SQLITE),) +CPPDB_CONF_OPTS += -DDISABLE_SQLITE=ON endif $(eval $(cmake-package))