From patchwork Sat Nov 21 19:22:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 547226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 250761402B4 for ; Sun, 22 Nov 2015 06:22:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b=YWCTg3eM; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C4FDD92488; Sat, 21 Nov 2015 19:22: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 cbWRDShNxd3a; Sat, 21 Nov 2015 19:22:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0161E92486; Sat, 21 Nov 2015 19:22:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 561341C146C for ; Sat, 21 Nov 2015 19:22:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4455F33B1B for ; Sat, 21 Nov 2015 19:22:29 +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 KWeTpTU9b452 for ; Sat, 21 Nov 2015 19:22:28 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by silver.osuosl.org (Postfix) with ESMTPS id A0C9B25EBE for ; Sat, 21 Nov 2015 19:22:27 +0000 (UTC) Received: from dovecot03.posteo.de (dovecot03.posteo.de [172.16.0.13]) by mout01.posteo.de (Postfix) with ESMTPS id 2FB83209DE for ; Sat, 21 Nov 2015 20:22:25 +0100 (CET) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3p34Ps0LN1z5vMK for ; Sat, 21 Nov 2015 20:22:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail.embedded.rocks (Postfix) with ESMTP id 96214EE0C4E; Sat, 21 Nov 2015 20:22:24 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:references:in-reply-to:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=default; t= 1448133732; x=1448738533; bh=z73lLRmZImZECF7OII1d2DRv2vGu0pVbvdC /1BXNyqU=; b=YWCTg3eMwoMzTja8fHMyXDCwj4SFCcbFp8/yKg+LZELD1tJx75t /bTE9kvyl4hPUB9qz4gIe8fNox5pM/okQiSRijFkdsmjgRYyrmxe9fs4m8bG6Pst gDEFE/qMwN4Uu5aUhJVtfnrQL0CC3T7VdvTtwfMz7Buy7qCtwatGU54vzvS2w6+9 eseiiIRjrZPMT9f+XtwHjJFTtlUmKlq4JJaEiASF3QHHt22zgV/yULqkQJv64JNY jYeCPS8T07hlBp6qcXP0ROKe//DhIyFuuWjf3s1Ccxow9knuJnoYsUwPyE3Mmjxo /NQqqWVYoCoopOTsyPG1OyRvvhLE+UTtZgg== X-Virus-Scanned: Debian amavisd-new at mail.embedded.rocks Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id d2V2QIsVpK2r; Sat, 21 Nov 2015 20:22:12 +0100 (CET) Received: from nzxt.fritz.box (x5f72ed02.dyn.telefonica.de [95.114.237.2]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Sat, 21 Nov 2015 20:22:12 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Sat, 21 Nov 2015 20:22:06 +0100 Message-Id: <1448133726-24457-2-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1448133726-24457-1-git-send-email-joerg.krause@embedded.rocks> References: <1448133726-24457-1-git-send-email-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/yajl: add patch to fix static build issue X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" mpd's plugin soundcloud requires yajl. In static build context yajl library is named yajl_s so linking against yajl fails: /bin/ld: cannot find -lyajl Use a pull request patch [1] to let the shared and the static library have the same name. They will be differentiated by the extension (.so or .a). Fixes: http://autobuild.buildroot.net/results/5ac/5acba9b0ed852512fc88e83973a3b5389e6d54be/ http://autobuild.buildroot.net/results/739/73934ad67efa121fedeaa03fdad290aa63f1485e/ [1] https://github.com/lloyd/yajl/pull/174 Signed-off-by: Jörg Krause --- package/yajl/yajl.hash | 1 + package/yajl/yajl.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/yajl/yajl.hash b/package/yajl/yajl.hash index 6e025a2..315d847 100644 --- a/package/yajl/yajl.hash +++ b/package/yajl/yajl.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 0e78f516dc53ecce7dc073f9a9bb0343186b58ef29dcd1dad74e5e853b216dd5 yajl-2.0.4.tar.gz +sha256 0f075b5f9a38bc02077370d4d57d12e615cfaaf7f634e3f2fc746b6582854e53 6d09f11b8fd358cab0e31b965327e64a599f9ce9.patch diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index ff64123..81f29e7 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -9,5 +9,6 @@ YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING +YAJL_PATCH = https://github.com/vriera/yajl/commit/6d09f11b8fd358cab0e31b965327e64a599f9ce9.patch $(eval $(cmake-package))