From patchwork Mon Oct 15 13:59:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diekema, Jon (GE Aviation, US)" X-Patchwork-Id: 191568 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 3DA892C00A7 for ; Tue, 16 Oct 2012 00:59:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BC35930E2B; Mon, 15 Oct 2012 13:59:42 +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 50rZl181Xv9Y; Mon, 15 Oct 2012 13:59:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1FC5830E2E; Mon, 15 Oct 2012 13:59:41 +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 663ED8F74A for ; Mon, 15 Oct 2012 13:59:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 71A9689F9E for ; Mon, 15 Oct 2012 13:59:39 +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 KJfKTbYttZRs for ; Mon, 15 Oct 2012 13:59:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from exprod5og102.obsmtp.com (exprod5og102.obsmtp.com [64.18.0.143]) by whitealder.osuosl.org (Postfix) with ESMTPS id 76F3C86331 for ; Mon, 15 Oct 2012 13:59:37 +0000 (UTC) Received: from cinmlip10.e2k.ad.ge.com ([12.71.149.1]) (using TLSv1) by exprod5ob102.postini.com ([64.18.4.12]) with SMTP ID DSNKUHwWyPpwztTKqaOAr3xyy8erhDHTPOTx@postini.com; Mon, 15 Oct 2012 06:59:37 PDT Received: from unknown (HELO cinmlef07.e2k.ad.ge.com) ([3.159.213.38]) by cinmlip10.e2k.ad.ge.com with ESMTP; 15 Oct 2012 09:59:34 -0400 Received: from CINMLVEM24.e2k.ad.ge.com ([3.159.215.70]) by cinmlef07.e2k.ad.ge.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 15 Oct 2012 09:59:34 -0400 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Date: Mon, 15 Oct 2012 09:59:33 -0400 Message-ID: <0B3FAF466948654CB218059DFE15DF23BBC000@CINMLVEM24.e2k.ad.ge.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: thread-topic: Buildroot patch for adding Tokyo Cabinet thread-index: Ac2q3U2iPrE8HeytSvCbc5HBYmBp5w== From: "Diekema, Jon (GE Aviation, US)" To: X-OriginalArrivalTime: 15 Oct 2012 13:59:34.0925 (UTC) FILETIME=[4EBF0BD0:01CDAADD] Subject: [Buildroot] Buildroot patch for adding Tokyo Cabinet 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 Signed-off-by: Jon Diekema buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot diff --git a/package/Config.in b/package/Config.in index e129522..8f519b5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -331,6 +331,7 @@ source "package/berkeleydb/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..340008c --- /dev/null +++ b/package/tokyocabinet/tokyocabinet-1.4.47-include.patch @@ -0,0 +1,19 @@ +Signed-off-by: Jon Diekema + +Removing /usr/include, ~/include, and /usr/local/include from the +include search path. Other than the current directory, use the +defaults from the toolchain. + +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..df3762c --- /dev/null +++ b/package/tokyocabinet/tokyocabinet.mk @@ -0,0 +1,40 @@ +############################################################# +# +# Tokyo Cabinet +# +############################################################# + +# +# Generic Infrastructure +# +TOKYOCABINET_VERSION = 1.4.47 +TOKYOCABINET_SOURCE = tokyocabinet-$(TOKYOCABINET_VERSION).tar.gz +TOKYOCABINET_SITE = http://httpsqs.googlecode.com/files +# TOKYOCABINET_PATCH = +# TOKYOCABINET_SUBDIR = +TOKYOCABINET_DEPENDENCIES = +TOKYOCABINET_INSTALL_STAGING = YES +TOKYOCABINET_INSTALL_TARGET = YES +TOKYOCABINET_LICENSE = LGPLv2.1 +TOKYOCABINET_LICENSE_FILES = COPYING + +# +# Autotools Infrastructure +# +TOKYOCABINET_CONF_ENV = +TOKYOCABINET_CONF_OPT = --disable-zlib --disable-bzip --enable-pthread +TOKYOCABINET_MAKE = $(MAKE) TOKYOCABINET_MAKE_ENV = +TOKYOCABINET_MAKE_OPT = TOKYOCABINET_AUTORECONF = YES +TOKYOCABINET_AUTORECONF_OPT = TOKYOCABINET_LIBTOOL_PATCH = YES +TOKYOCABINET_CLEAN_OPT = clean + +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)) _______________________________________________