From patchwork Sun Nov 4 19:25:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 197088 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 391D82C0100 for ; Mon, 5 Nov 2012 06:28:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B367330E98; Sun, 4 Nov 2012 19:28:04 +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 Qz7vkt1usFDx; Sun, 4 Nov 2012 19:28:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6437730DBD; Sun, 4 Nov 2012 19:28:03 +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 5C9D48F74A for ; Sun, 4 Nov 2012 19:28:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 75B3C8A607 for ; Sun, 4 Nov 2012 19:28:02 +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 XniNh3EpzJBS for ; Sun, 4 Nov 2012 19:28:01 +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 5048D8A3B6 for ; Sun, 4 Nov 2012 19:28:01 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id s43so2900909wey.16 for ; Sun, 04 Nov 2012 11:27:59 -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=wHpUUKdvLiOncKRHmC3r3S6cV/N1RRx4g9UuLTFj42Y=; b=nj7G4vXhrH+NQT1Ta2WeM3VuW3psR4pzc0ASNoIRwocczWR0oqmnpdd3A08+eKZO29 ncQ/uRaq4SvqiV3Uk1SNS33ID3XfW+VMf7UfNvUdbfd5k3G5xruA7HAjfnIuvhfwSAvx sFRXCcfDbyTIVjCfHd5QJzfg72ghya1+TQ1Mc+cLu+ZVNgsqoNmJo0pJtQ5yGwAkPMyT E2+zN9JMrgQDgzJd+waHdIjUV01g3J1ifIIcOQZBiPBteUi5TxQht39ZLyUgAuOQAG4x HIilcChpw1Tyy+dU12FnQhsyu6Lub4WwhekJIU+QBYbfWy1qxdZAvAJY+FDCsWT8Y5Fy MGng== Received: by 10.216.142.102 with SMTP id h80mr2307280wej.179.1352057279641; Sun, 04 Nov 2012 11:27:59 -0800 (PST) Received: from localhost.localdomain (182.Red-88-19-115.staticIP.rima-tde.net. [88.19.115.182]) by mx.google.com with ESMTPS id cc7sm747004wib.6.2012.11.04.11.27.56 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 04 Nov 2012 11:27:58 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Sun, 4 Nov 2012 20:25:23 +0100 Message-Id: <1352057123-7137-2-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352057123-7137-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1352057123-7137-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 2/2] 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 --- 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