From patchwork Thu Nov 8 21:34:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 197896 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 3EF8E2C00A3 for ; Fri, 9 Nov 2012 08:34:39 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DB7FD30D18; Thu, 8 Nov 2012 21:34:37 +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 jY9+JDSoYCQ7; Thu, 8 Nov 2012 21:34:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 22064311EE; Thu, 8 Nov 2012 21:34:22 +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 C09F38F74A for ; Thu, 8 Nov 2012 21:34:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B2914814A2 for ; Thu, 8 Nov 2012 21:34:20 +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 AweSfqtlcqHM for ; Thu, 8 Nov 2012 21:34:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id CDBB681482 for ; Thu, 8 Nov 2012 21:34:18 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id s43so1828789wey.16 for ; Thu, 08 Nov 2012 13:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=DkVIvCakA9v6lMAheqVZ2cQyIy7/vSHfUUxFmcEE+j0=; b=ONRjP7Pz8gDea0EBLHxtJdoQ1LKXPEdAa8xgT0n3mBHE4KXNOy+BdK2FO/o3O3pua0 X4BhklIVfUa5qA4p5bgrFE8dNFH8l5FpWE4u5vRV9PRdkFPZdic2gLDLJHdfjXWM8e6V hM0RXK9KvJg8ArcBhNosvEB9iMfGA7vtxUXh2QuPdofTERccUP3FyjVGZFvf9qmLppJ4 apxblA+FIgqD+xmioBeLPbFZIJTfFI7u4aVVEW8uRVonVLgBVNH+NOy0WRG8RTnKk5zC n1L7WwLngiem474VQxZY2andFJPcM3bbiva2Q9HV39n3hKuwdGWERbPPnGl5ddHXLlRZ Ed0w== Received: by 10.216.195.222 with SMTP id p72mr4020669wen.33.1352410457147; Thu, 08 Nov 2012 13:34:17 -0800 (PST) Received: from localhost.localdomain (13-105-190-109.dsl.ovh.fr. [109.190.105.13]) by mx.google.com with ESMTPS id bn7sm10231630wib.8.2012.11.08.13.34.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Nov 2012 13:34:16 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Thu, 8 Nov 2012 22:34:12 +0100 Message-Id: <1352410452-10680-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352057123-7137-2-git-send-email-maxime.hadjinlian> References: <1352057123-7137-2-git-send-email-maxime.hadjinlian> Subject: [Buildroot] [PATCH 2/2] netatalk: Make BerkeleyDB optional for Netatalk 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net As the documentation of netatalk states : "dbd is the default backend since version 2.1" So cdb (which is the CNID provided by BerkeleyDB) should not be the default. Also, this patches fixes a trouble when compiling with berkeleydb in 64bits where netatalk would look the berkeleylib in [...]/lib64 instead of [...]/lib Signed-off-by: Maxime Hadjinlian --- package/netatalk/Config.in | 1 - package/netatalk/netatalk.mk | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) -- 1.7.10.4 diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in index 26f14c3..e602acd 100644 --- a/package/netatalk/Config.in +++ b/package/netatalk/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_NETATALK bool "netatalk" - select BR2_PACKAGE_BERKELEYDB select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGPG_ERROR diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 4aa179e..70c8a13 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -7,11 +7,10 @@ NETATALK_VERSION = 3.0 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 -NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error +NETATALK_DEPENDENCIES = host-pkg-config openssl libgcrypt libgpg-error NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" -NETATALK_CONF_OPT += --with-cnid-cdb-backend \ - --with-bdb=$(STAGING_DIR)/usr \ - --disable-zeroconf \ + +NETATALK_CONF_OPT += --disable-zeroconf \ --with-ssl-dir=$(STAGING_DIR)/usr \ --with-libgcrypt-dir=$(STAGING_DIR)/usr \ --with-shadow \ @@ -19,6 +18,15 @@ NETATALK_CONF_OPT += --with-cnid-cdb-backend \ --without-kerberos \ --without-pam +ifeq ($(BR2_PACKAGE_BERKELEYDB),y) + NETATALK_DEPENDENCIES += berkeleydb + NETATALK_CONF_ENV += BDB_LIB=$(STAGING_LIB)/usr/lib + NETATALK_CONF_OPT += --with-cnid-cdb-backend \ + --with-bdb=$(STAGING_DIR)/usr +else + NETATALK_CONF_OPT += --without-cnid-cdb-backend +endif + ifeq ($(BR2_PACKAGE_CUPS),y) NETATALK_DEPENDENCIES += cups NETATALK_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config