From patchwork Thu Aug 13 19:55:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 507169 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 75C131401B5 for ; Fri, 14 Aug 2015 05:55:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=B73rq9fk; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AF5D092560; Thu, 13 Aug 2015 19:55:46 +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 jgSoi-OH7TE5; Thu, 13 Aug 2015 19:55:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3031392540; Thu, 13 Aug 2015 19:55:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0B18F1CE788 for ; Thu, 13 Aug 2015 19:55:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 06018963FE for ; Thu, 13 Aug 2015 19:55:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ssUMXN8e0cZC for ; Thu, 13 Aug 2015 19:55:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by hemlock.osuosl.org (Postfix) with ESMTPS id EED7396293 for ; Thu, 13 Aug 2015 19:55:41 +0000 (UTC) Received: by wibhh20 with SMTP id hh20so87861375wib.0 for ; Thu, 13 Aug 2015 12:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=jmZq/o9caqBDPK8ZXPwycjKvBCS1ztiTBdzmp0q6oFY=; b=B73rq9fkJv+HMzQJt36f3vqJJB3fBS30t9CFeQk3wNrS0b+feLOPM8re44wfbdcbsa IuIF3YLtMnFTs5YPLFObCHm2GDjvb3Z/EwTanF+5ymSDYNWnosDl2YTU9cWOfgv9fgHz 4nMBxH8yRds0y1qmpzUlJdZnPZM0dkU3sTbfoEP7bouzJBFyHN/JPdEjwaEc3SqBXIul tPUoTOrD1w3Z8/GreB/iBvG0+W9h/mATYI/MsC2hDdIcEqgwvAwfX4rVFvOBILyJdDAE luq+zdNleLfSLExpBqzPlrJntRiG7SU8VK+lSI4oslK9CbMxn2xoTLzS7OrldSC2SSL7 6klg== X-Received: by 10.180.106.68 with SMTP id gs4mr9546803wib.61.1439495740500; Thu, 13 Aug 2015 12:55:40 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id fb3sm4833388wib.21.2015.08.13.12.55.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Aug 2015 12:55:39 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Thu, 13 Aug 2015 21:55:31 +0200 Message-Id: <1439495731-8645-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH] [autobuild] package/nbd: fix static builds 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/ (arm) http://autobuild.buildroot.org/results/e5b/e5bd05623dd6c57bb0338592ecd21a5ba0cbe95a/ (arc) http://autobuild.buildroot.org/results/e0f/e0fd23eec2dd31bece122d84515b2b7cb14594b8/ (ppc) http://autobuild.buildroot.org/results/3a2/3a2d4124f78d4e504e8e961fabe038e570923408/ (mips) ... Signed-off-by: "Yann E. MORIN" --- package/nbd/0001-avoid-name-clashing.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/nbd/0001-avoid-name-clashing.patch diff --git a/package/nbd/0001-avoid-name-clashing.patch b/package/nbd/0001-avoid-name-clashing.patch new file mode 100644 index 0000000..b3ea9c9 --- /dev/null +++ b/package/nbd/0001-avoid-name-clashing.patch @@ -0,0 +1,28 @@ +rename err() function to avoid clashing with err() form C library + +err() is a function available in the C library, so when static linking, +there is a clash at link timebecause the function is provided both by +nbd and the C library: + http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/build-end.log + +Fix that by renaming err() to nbd_err() and providing a small maco +wrapper to avoid touching the many call sites. + +Signed-off-by: "Yann E. MORIN" + +--- +Upstream status: hack, not submitted. + +diff -durN nbd-3.11.orig/cliserv.h nbd-3.11/cliserv.h +--- nbd-3.11.orig/cliserv.h 2015-05-25 12:27:56.000000000 +0200 ++++ nbd-3.11/cliserv.h 2015-08-13 19:28:21.609467505 +0200 +@@ -75,7 +75,8 @@ + void setmysockopt(int sock); + void err_nonfatal(const char *s); + +-void err(const char *s) G_GNUC_NORETURN; ++void nbd_err(const char *s) G_GNUC_NORETURN; ++#define err(S) nbd_err(S) + + void logging(const char* name); +