From patchwork Thu Aug 30 13:42:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 963884 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bPosCiXq"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 421NwC20qpz9ryn for ; Thu, 30 Aug 2018 23:42:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A3C9986A6B; Thu, 30 Aug 2018 13:42:31 +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 0x6xxw6qwF4b; Thu, 30 Aug 2018 13:42:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A132869C9; Thu, 30 Aug 2018 13:42:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0D1321C0378 for ; Thu, 30 Aug 2018 13:42:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 08BB785C97 for ; Thu, 30 Aug 2018 13:42:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3WNRipZPEFCo for ; Thu, 30 Aug 2018 13:42:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 85F7E85C37 for ; Thu, 30 Aug 2018 13:42:27 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id n11-v6so2069296wmc.2 for ; Thu, 30 Aug 2018 06:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DEx/rJF4Qlhw/knrKevEaF4bgcig5tUCE4oc/rsyHc0=; b=bPosCiXqtcpnAojFwokfTBFqKb8qRDFwopuhXQo3l8YHt5aY43qZoRqx6c90wtagsu fP9ljLXkEPMc7OK6vnUOZd/TiYe4j4ECnTNMRg83UvDWcVhWuZoQjC+y0b94ACjKi1P+ 839zsfLLlVFzJNWOiJaBGJad6B7W3b+PBxWSDNqqD1Nv2Nvk92NxNqvj3WzqfBUfoXeA vAxYN6TE3W1bvWy6GebHinrnSbwqugc43FGIwX1tx13yAYx7+FGNXEid8fEo+zlMCmQs XQC8pgAe5Wymmv79VOhyzzR17pB65C1jlps8RVPrtW2Pajv17Dj9gDEYcV22Tsprn+ML fOmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DEx/rJF4Qlhw/knrKevEaF4bgcig5tUCE4oc/rsyHc0=; b=rPE0TjgKHD9lE53lLbuewoPVrLKv2VoyuXKoO+Ws4w7wup5T2Bk4+/hKSM1rlssVXt rs9uVOpmzNyWXIuELfoAWkDPCgCwQJM5g3XTSGF4jcLTINmKnxVNdpa9UcgzeONmFh7F 84I1V1AD266bdQY5iHzAIInZrSltqyokM9j07dsTRfTYhBDLmogsFRP4ONXdu76MZNDZ svfiIkaueeRQQVL1b6cgwRjQR0axO1NXzy56XpT3XTaDpfbaVhpH5NwqkYCPqKHqI4uf quOhjkmkMIJwKQZ5huVRJgKk2erdxUMaPA1aag03ndviqxFnYrgfEdw+a9FqhnlkM5t8 rZvg== X-Gm-Message-State: APzg51B9vHhmHnXEg6vT942spibInzXP8Z3S+usq33J7H6lgQ7edq6ao k6F7eatskXDarqx93F19Yj3JzWdI X-Google-Smtp-Source: ANB0VdbLgOLfZPvfi/mjNYtqW1VL3ap+eSVlXwIXJ0E8b7OEkKYTCAVgxlvGBo30xtpfNOgsIn31Mw== X-Received: by 2002:a1c:e0d7:: with SMTP id x206-v6mr1732312wmg.74.1535636545894; Thu, 30 Aug 2018 06:42:25 -0700 (PDT) Received: from localhost.localdomain (bzq-84-108-5-46.cablep.bezeqint.net. [84.108.5.46]) by smtp.gmail.com with ESMTPSA id a9-v6sm2285112wmf.28.2018.08.30.06.42.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 06:42:25 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Thu, 30 Aug 2018 16:42:20 +0300 Message-Id: <20180830134220.9545-1-asafka7@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/1] libtorrent: refactor openssl optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Asaf Kahlon --- package/libtorrent/libtorrent.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk index 8d74addaf7..de964b45ae 100644 --- a/package/libtorrent/libtorrent.mk +++ b/package/libtorrent/libtorrent.mk @@ -6,15 +6,20 @@ LIBTORRENT_VERSION = 0.13.7 LIBTORRENT_SITE = http://rtorrent.net/downloads -LIBTORRENT_DEPENDENCIES = host-pkgconf zlib \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) +LIBTORRENT_DEPENDENCIES = host-pkgconf zlib LIBTORRENT_CONF_OPTS = --enable-aligned \ --disable-instrumentation \ - --with-zlib=$(STAGING_DIR)/usr \ - $(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl) + --with-zlib=$(STAGING_DIR)/usr LIBTORRENT_INSTALL_STAGING = YES LIBTORRENT_AUTORECONF = YES LIBTORRENT_LICENSE = GPL-2.0 LIBTORRENT_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBTORRENT_CONF_OPTS += --enable-openssl +LIBTORRENT_DEPENDENCIES += openssl +else +LIBTORRENT_CONF_OPTS += --disable-openssl +endif + $(eval $(autotools-package))