From patchwork Sun Nov 1 18:47:30 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: 538807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 1247C141302 for ; Mon, 2 Nov 2015 05:47:58 +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=gTQ3o/gP; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1709A273B2; Sun, 1 Nov 2015 18:47:57 +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 bgfhrbrG+g87; Sun, 1 Nov 2015 18:47:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DB32025142; Sun, 1 Nov 2015 18:47:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 698211C11CD for ; Sun, 1 Nov 2015 18:47:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 640A287D44 for ; Sun, 1 Nov 2015 18:47:53 +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 nAhbLgSRwJCT for ; Sun, 1 Nov 2015 18:47:52 +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 whitealder.osuosl.org (Postfix) with ESMTPS id AFB8887D43 for ; Sun, 1 Nov 2015 18:47:51 +0000 (UTC) Received: from dovecot03.posteo.de (dovecot03.posteo.de [172.16.0.13]) by mout01.posteo.de (Postfix) with ESMTPS id D6829209C6 for ; Sun, 1 Nov 2015 19:47:48 +0100 (CET) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3npmb83dbKz5vNH; Sun, 1 Nov 2015 19:47:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail.embedded.rocks (Postfix) with ESMTP id 88BFCEE0C1A; Sun, 1 Nov 2015 19:47:47 +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:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1446403653; x=1447008454; bh=MKwYOTshT1YhyjoWdrBUzhtFqDPkTYvBXGLKZANMaPc=; b=gTQ3o/gP9pZA zPidVlAvZB7HtVv2z8UqEr+D3RRKKqsMUJofCr7L9/5ZCK7kqxrB97DLeowWxFNe IsmUmXOpO+E8WEnkQqbvznFIizkJWcC3ktBpk+IYgEENnbcQxcncvC3x08xXDrCI w+WFkaGTkJZeD06MbQ+GzeIypuCDH2Bm8a99GSY8rNSoKmOBzRXZ6Qu57wtnbh9Y +pV4Z7AZ2umDSA2nbVbSk5eOatI/PP1vBTQ4BC2nudaDV1VBvAvxba+LL6Hx1Q6J V0MBC2TW5qXGU9cNSn1AmkWszTCxxcU2L8BjCLX1LpyyasAhwMpKh1jQZ7tjPLLn hKFBE5UJ2g== 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 PXMhxSmZB6Hv; Sun, 1 Nov 2015 19:47:33 +0100 (CET) Received: from nzxt.fritz.box (x2f74ecc.dyn.telefonica.de [2.247.78.204]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Sun, 1 Nov 2015 19:47:33 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Sun, 1 Nov 2015 19:47:30 +0100 Message-Id: <1446403650-21177-1-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.6.2 MIME-Version: 1.0 Cc: Thomas Petazzoni , =?UTF-8?q?Bj=C3=B8rn=20Forsman?= , "Yann E . MORIN" Subject: [Buildroot] [PATCH v2] package/swupdate: fix build issue with some toolchains 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" Add patch from upstream to fix build issue with some toolchains. For some toolchains used in Buildroot (x86_64 and mips64) partial linking using 'ld' directly doesn't work well, as the 'ld' default emulation may not necessarily be the correct one. Note, that the default emulation depends upon how the linker was configured at build time. The leads to different kind of build errors, like: * /usr/bin/i686-pc-linux-gnu-ld: Relocatable linking with relocations from format elf64-x86-64 (core/swupdate.o) to format elf32-i386 (core/built-in.o) is not supported. * /usr/bin/mips-linux-gnu-ld: handlers/raw_handler.o: endianness incompatible with that of the selected emulation * /usr/bin/mips64el-linux-ld: core/swupdate.o: ABI is incompatible with that of the selected Linking with gcc will pass all the appropriate linker flags to the linker. '-nostdlib' has to be added to ldflags-y to link properly without pulling in GCC libs during partial linking. Note, for Kbuild ldflags-y is prefered over the deprecated EXTRA_LDFLAGS. Build config for x86_64: BR2_x86_64=y BR2_x86_corei7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209=y Runtime test: $ output/build/swupdate-2015.07/swupdate -v Swupdate v2015.07.0 Licensed under GPLv2. See source distribution for detailed copyright notices. Registered handlers: rawfile raw Note, that a previous patch [1] had to be reverted [2] because ld does not take gcc's constructor functions into account and so none of the handlers have been registered at runtime. Fixes: http://autobuild.buildroot.net/results/de9/de920298075d32f3de83a0cfb7417846eb833425/ http://autobuild.buildroot.net/results/975/975915aa33005806e78260bae385cd4b3e359ca8/ http://autobuild.buildroot.net/results/c54/c54e7a2ea353d95d41a1e966de0dffa7b6ac432e/ http://autobuild.buildroot.net/results/019/0198596ebfed05ab86552b628da2274d55bf42ae/ and many more. [1] https://patchwork.ozlabs.org/patch/532542/ [2] https://patchwork.ozlabs.org/patch/535408/ Cc: Bjørn Forsman Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Jörg Krause Reviewed-by: "Yann E. MORIN" --- Changes v2: - convince upstream to accept patch (Thomas Petazzoni) - adapt commit message --- package/swupdate/swupdate.hash | 1 + package/swupdate/swupdate.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index eb7722c..c57ab89 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 1410f8967aad0f4d3b4561110dbfb2c1f8e337bdc332f6b120f4995762c8bf6b swupdate-2015.07.tar.gz sha256 6cffe115cad73c0d1095f7880b6d2b97fc12b7f7871f532e5b33717e863f03d7 5a5ef5909f5da5b2070d58ffaee924bb8e6a51e1.patch +sha256 b97a107a0e4625337485b9bb118bc9a33fa0f2bfcb80475cff017940b5261238 f26577423eb65728fcd10f78f9978dd07d51dcb9.patch diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index bcdc764..e22bc08 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -9,7 +9,8 @@ SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPLv2+, MIT, Public Domain SWUPDATE_LICENSE_FILES = COPYING SWUPDATE_PATCH = \ - https://github.com/sbabic/swupdate/commit/5a5ef5909f5da5b2070d58ffaee924bb8e6a51e1.patch + https://github.com/sbabic/swupdate/commit/5a5ef5909f5da5b2070d58ffaee924bb8e6a51e1.patch \ + https://github.com/sbabic/swupdate/commit/f26577423eb65728fcd10f78f9978dd07d51dcb9.patch # swupdate bundles its own version of mongoose (version 3.8) and # lsqlite3 (version 0.8)