From patchwork Fri Mar 20 16:39:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Tintel X-Patchwork-Id: 452705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 04B9B1400F1 for ; Sat, 21 Mar 2015 03:40:01 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 930F9280331; Fri, 20 Mar 2015 17:39:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 631F8280329 for ; Fri, 20 Mar 2015 17:39:20 +0100 (CET) X-policyd-weight: using cached result; rate: -7.6 Received: from mail.tintel.eu (mail.tintel.eu [62.213.201.86]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 20 Mar 2015 17:39:19 +0100 (CET) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 4A0472A4E11 for ; Fri, 20 Mar 2015 17:39:44 +0100 (CET) Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id hgxvw9SHN2Zm for ; Fri, 20 Mar 2015 17:39:43 +0100 (CET) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 6FBD92A4E12 for ; Fri, 20 Mar 2015 17:39:43 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.tintel.eu Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id V0Dl_3gYz9bj for ; Fri, 20 Mar 2015 17:39:43 +0100 (CET) Received: from taz.st-esk.be.tintel.eu (unknown [IPv6:2a02:1811:80:50:12bf:48ff:fed5:44b8]) by mail.tintel.eu (Postfix) with SMTP id 4943D2A4E11 for ; Fri, 20 Mar 2015 17:39:42 +0100 (CET) Received: by taz.st-esk.be.tintel.eu (sSMTP sendmail emulation); Fri, 20 Mar 2015 17:39:43 +0100 From: Stijn Tintel To: openwrt-devel@lists.openwrt.org Date: Fri, 20 Mar 2015 17:39:43 +0100 Message-Id: <1426869583-20460-1-git-send-email-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.0.5 Subject: [OpenWrt-Devel] [PATCH] build: add optional dependency on libssp to all non-kernel packages X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" When enabling SSP_SUPPORT, a lot of packages fail during compile phase with the following error: Package X is missing dependencies for the following libraries: libssp.so.0 This can be solved by adding an optional dependency on libssp to all those packages, but as there are quite a few packages both in OpenWrt core and in the package repository, it might make sense to add this optional dependency to all non-kernel packages, instead of polluting lots of package dependency lines with it. Signed-off-by: Stijn Tintel --- include/package-defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/package-defaults.mk b/include/package-defaults.mk index a94f2a4..9567e04 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -PKG_DEFAULT_DEPENDS = +libc +USE_GLIBC:librt +USE_GLIBC:libpthread +PKG_DEFAULT_DEPENDS = +libc +SSP_SUPPORT:libssp +USE_GLIBC:librt +USE_GLIBC:libpthread ifneq ($(PKG_NAME),toolchain) PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2)))