From patchwork Fri Dec 21 14:45:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Diekema X-Patchwork-Id: 207827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 08C7A2C0080 for ; Sat, 22 Dec 2012 01:45:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5A9392080D; Fri, 21 Dec 2012 14:45:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Os5m8HWBeGe0; Fri, 21 Dec 2012 14:45:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B96FF3062C; Fri, 21 Dec 2012 14:45:20 +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 D26FD8F75B for ; Fri, 21 Dec 2012 14:45:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2D5738C281 for ; Fri, 21 Dec 2012 14:45:19 +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 n3ndbl9IdfQL for ; Fri, 21 Dec 2012 14:45:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 776098C260 for ; Fri, 21 Dec 2012 14:45:17 +0000 (UTC) Received: by mail-vc0-f169.google.com with SMTP id gb23so5310580vcb.0 for ; Fri, 21 Dec 2012 06:45:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=J8ia61uedZ4gptw7YeR0HvseWd2q3lwcRTg00MIcVtw=; b=p9+cVyhGs4ykyHa/DGYX6/S72i8cPs0TqLh7BfpmCfr743e/EqvbW2NuwIoUgPeFSu big577MP8dvNPu9NTi5A8OXMeGDCZt7/VTCFw3lOerlC5wiw5lknNqXEZ8E+QDPj9/dc N7013MrC6Kdrq2mcQ4hEgDsGmdcjOSWJATuxfWnguZ6SETmpAPvUyxZbyC08Fx3AtEOc FIMFO6a51BIWUDOQ8V+BCRPbH20sOU1nGDh0M/M4Ce3NQGLmFZbD+IJ6G4AQNudITaaM X4Fmqk1/5THSn96g+lhQs55LCnBLem8G1SowjQy7lJ8ZFKUtd/0blZfxsCnauRG/Qe58 9fFg== MIME-Version: 1.0 Received: by 10.220.153.212 with SMTP id l20mr20211205vcw.1.1356101116141; Fri, 21 Dec 2012 06:45:16 -0800 (PST) Received: by 10.58.46.42 with HTTP; Fri, 21 Dec 2012 06:45:16 -0800 (PST) Date: Fri, 21 Dec 2012 09:45:16 -0500 Message-ID: From: Jon Diekema To: buildroot@busybox.net Subject: [Buildroot] tokyocabinet: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net tokyocabinet: new package Signed-off-by: Jon Diekema Change Summary: --------------- package/Config.in | 2 + package/tokyocabinet/Config.in | 7 ++++ .../tokyocabinet/tokyocabinet-1.4.47-include.patch | 19 +++++++++ package/tokyocabinet/tokyocabinet.mk | 42 ++++++++++++++++++++ 4 files changed, 70 insertions(+) M package/Config.in A package/tokyocabinet/Config.in A package/tokyocabinet/tokyocabinet-1.4.47-include.patch A package/tokyocabinet/tokyocabinet.mk Patch (ignoring white space changes): ------------------------------------- diff --git a/package/Config.in b/package/Config.in index 15d7ad6..06efdd6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -359,6 +360,7 @@ source "package/gdbm/Config.in" source "package/mysql_client/Config.in" source "package/sqlcipher/Config.in" source "package/sqlite/Config.in" +source "package/tokyocabinet/Config.in" endmenu menu "Filesystem" diff --git a/package/tokyocabinet/Config.in b/package/tokyocabinet/Config.in new file mode 100644 index 0000000..66ff02e --- /dev/null +++ b/package/tokyocabinet/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_TOKYOCABINET + bool "Tokyo Cabinet" + help + A modern reimplementation of QDBM, also released under the LGPL + by Mikio Hirabayashi in 2007. + + http://www.igvita.com/2009/02/13/tokyo-cabinet-beyond-key-value-store/ diff --git a/package/tokyocabinet/tokyocabinet-1.4.47-include.patch b/package/tokyocabinet/tokyocabinet-1.4.47-include.patch new file mode 100644 index 0000000..cdfc234 --- /dev/null +++ b/package/tokyocabinet/tokyocabinet-1.4.47-include.patch @@ -0,0 +1,19 @@ +Remove /usr/include, ~/include, and /usr/local/include from the +include search path. Other than the current directory, use the +include defaults from the toolchain. + +Signed-off-by: Jon Diekema + +diff --git a/configure.in b/configure.in +index 8db195e..60cad20 100644 +--- a/configure.in ++++ b/configure.in +@@ -32,7 +32,7 @@ MYPCFILES="tokyocabinet.pc" + + # Building flags + MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" +-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" ++MYCPPFLAGS="-I." + MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" + MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" + MYCMDLDFLAGS="" diff --git a/package/tokyocabinet/tokyocabinet.mk b/package/tokyocabinet/tokyocabinet.mk new file mode 100644 index 0000000..a5fa21d --- /dev/null +++ b/package/tokyocabinet/tokyocabinet.mk @@ -0,0 +1,42 @@ +############################################################# +# +# Tokyo Cabinet +# +############################################################# + +TOKYOCABINET_VERSION = 1.4.47 +TOKYOCABINET_SOURCE = tokyocabinet-$(TOKYOCABINET_VERSION).tar.gz +TOKYOCABINET_SITE = http://httpsqs.googlecode.com/files +TOKYOCABINET_INSTALL_STAGING = YES +TOKYOCABINET_LICENSE = LGPLv2.1 +TOKYOCABINET_LICENSE_FILES = COPYING + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) + TOKYOCABINET_CONF_OPT += --enable-pthread +else + TOKYOCABINET_CONF_OPT += --disable-pthread +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) + TOKYOCABINET_DEPENDENCIES += zlib + TOKYOCABINET_CONF_OPT += --enable-zlib +else + TOKYOCABINET_CONF_OPT += --disable-zlib +endif + +ifeq ($(BR2_PACKAGE_BZIP2),y) + TOKYOCABINET_DEPENDENCIES += bzip2 + TOKYOCABINET_CONF_OPT += --enable-bzip +else + TOKYOCABINET_CONF_OPT += --disable-bzip +endif + +TOKYOCABINET_AUTORECONF = YES + +define TOKYOCABINET_REMOVE_TARGET_FILES + rm -rf $(TARGET_DIR)/usr/share/tokyocabinet +endef + +TOKYOCABINET_POST_INSTALL_TARGET_HOOKS += TOKYOCABINET_REMOVE_TARGET_FILES + +$(eval $(autotools-package))