From patchwork Thu Jun 22 00:07:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 779213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wtMNv6CX5z9s72 for ; Thu, 22 Jun 2017 10:08:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="js5fWTct"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ysTVZxHGiV90AJ7CfCIS0/8RST/MUXhGwtoS3fFHs/o=; b=js5fWTctCv4d03 p/zjSBOAjQUipULBbiV770hZ+oKfr3cVa+E8tb6f6kduetj7ITZBIGJoyU8JbFSQcQ6q6ttTU5v1E XEOS6H0Tpgqh0M/kl0tDEZir58SrsRXoMau4LtK44C4Y4R1tQjj6rbXzohAlBm0vrqsLsk05KPJZN eOF3fqw/ZD9jRfLv5YcyGo4ZaQT8h1lzOrh7Ks4KiHeN85oS+4MxEQeyJfnN8BIGsWvHzyV9F/PdN I5+bCACmkT3huRdz5TNLYlzyEPKp2i3Z+g9mofXSsbsyJ3oeC+CHr71iHG/Sme+whC0eSwXb6T4gr rNOFJpX1MZfJjtRB3hEQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dNpf3-0001qi-Q1; Thu, 22 Jun 2017 00:07:49 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dNpez-0001q1-Rz for lede-dev@lists.infradead.org; Thu, 22 Jun 2017 00:07:47 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.88) (envelope-from ) id 1dNpeT-0004Qa-KL; Thu, 22 Jun 2017 02:07:13 +0200 Date: Thu, 22 Jun 2017 02:07:12 +0200 From: Daniel Golle To: lede-dev@lists.infradead.org Message-ID: <20170622000707.GA1792@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170621_170746_106461_11AF9ED1 X-CRM114-Status: UNSURE ( 6.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH] uhttpd: fix PKG_BUILD_DEPENDS X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Spooren , Felix Fietkau Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org uhttpd refered to ustream-ssl as PKG_BUILD_DEPENDS. While this intuitively seems like the correct thing to do, it turns out not to have the desired effect: PKG_BUILD_DEPENDS needs to list the resulting package name (ie. one of libustream-*) and not the source package name. This seems a bit ugly, as PKG_BUILD_DEPENDS should actually really reference source package names if you asked me. However, to fix things for now, use libustream-mbedtls to fix scripts/feeds and parallel builds which otherwise fail to build uhttpd. Reported-by: Paul Spooren Signed-off-by: Daniel Golle --- package/network/services/uhttpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 3d483b692d..12896a1bb2 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -18,7 +18,7 @@ PKG_MIRROR_HASH:=2ac4ba8dc0b349d72174aac9ff693a73a214295a9890fe3d2a8eedcad54d06e PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC -PKG_BUILD_DEPENDS = ustream-ssl +PKG_BUILD_DEPENDS = libustream-mbedtls include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk