From patchwork Mon Feb 12 21:17:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex B X-Patchwork-Id: 872408 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f/KbYJwX"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zgJSS3Zyhz9sBW for ; Tue, 13 Feb 2018 08:18:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B25787716; Mon, 12 Feb 2018 21:18:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U2kQpcReh8lS; Mon, 12 Feb 2018 21:18:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A5556875B3; Mon, 12 Feb 2018 21:18:43 +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 889421C3F88 for ; Mon, 12 Feb 2018 21:18:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 855BA2F658 for ; Mon, 12 Feb 2018 21:18:42 +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 eRVrn6khVIp5 for ; Mon, 12 Feb 2018 21:18:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by silver.osuosl.org (Postfix) with ESMTPS id 9BC612F5BF for ; Mon, 12 Feb 2018 21:18:41 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id f137so22317790lfe.4 for ; Mon, 12 Feb 2018 13:18:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pONCwXEok04ONAP806SE9OoPhW95Nt8R61kzTACrTYI=; b=f/KbYJwXYIOKCGFeAoKgPOMygsPmbyzW6+0Arje6Z7NNgOli64xEb/qphQoAbUDdR4 /3zeSP/AkZwWAN3jrMoRyz7T9gwe9ZxGJEZZYoVSctA92Q/gC3lLLX2C8juKg6rghdrh KpeKBVFfDY2D27PkXpUmjs8lQcVTURyH0sJnC4BPWpbqMyExY6hzNflkItMA7/QwYj/t XRATbkhKsdHl+BU39gGyCqGZFdnO7Xk7l5R26YwK3cAaHGyZjuTSuYJbN5L13kVPTqJt Po5zI+rI1jQC6BtDtv1uhRVeXjB3T8JGdsUuGbSxZt7afkuxsCWP6JlqsvLsUkWOwjNo 3aCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pONCwXEok04ONAP806SE9OoPhW95Nt8R61kzTACrTYI=; b=AallkQu0oObvkE+S0Z4s7NcW1PHlTMAF3yziciJJeKKsX8WK6jGIhiJ7rPnOZC/NNF DGvb+2luFydG0QvIdDXsJ23Ewn9w+W1Ht4dw8p1ZaaX/QgapaiY2xS0nDUFc2UqdlzOO ERf1e2Wqz5lZeTh+g8v+pVqKztUSgHd11vvzXxtrYRpynMdA7ExgmJauEllEsH/7uzlv /tS8aar5UON8cE0gaO9zkZt6pzcUiDXyzCSqzYjt2eFMYrVsjqk4vuZUH+OBn/mwve07 03nGV4cy1pO4cNrwpg97kZJfB5AespcodTag8XZ5teU8umZ+GSQZ3xUqvBqML0guPwsz Cwmw== X-Gm-Message-State: APf1xPAP2coeC6JLFJppRvnMEridSBZMRQSOYS1nCGo4Md/DMhuAxi4e 1y3ruwdeU5S3YenLVX8EDcn4YPBaXXo= X-Google-Smtp-Source: AH8x224a/dRHlw1FwDil5QUPDL8JgC9l0FzqMpX291GOYcb+aeIeTtu/NLS4E47LoMo1PxT/3idGsg== X-Received: by 10.46.2.1 with SMTP id 1mr8967216ljc.0.1518470319526; Mon, 12 Feb 2018 13:18:39 -0800 (PST) Received: from localhost.localdomain (0xc2ffb00e.linknet.dk.telia.net. [194.255.176.14]) by smtp.gmail.com with ESMTPSA id m187sm1855487lfe.39.2018.02.12.13.18.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Feb 2018 13:18:38 -0800 (PST) From: Alex B To: buildroot@buildroot.org Date: Mon, 12 Feb 2018 22:17:55 +0100 Message-Id: <1518470275-10997-1-git-send-email-alexbaldwinmusic@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH NEXT 1/1] Liblo - disable werror and link libatomic X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Alex This patch fixes 2 errors that were discovered by the autobuild: 1) -werror is still present, which threw up errors regarding redirecting sys/poll.h to poll.h in the file server.c To fix this -werror has been disbled with a conf_opt and a patch applied to server.c that fixes the redirect. 2) On some architectures libatomic must be linked. A conf_env has been added that links libatomic if it is present in the toolchain. Signed-off-by: Alex --- package/liblo/0000-server.c-fixHeaderRedirects.patch | 13 +++++++++++++ package/liblo/liblo.mk | 13 +++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 package/liblo/0000-server.c-fixHeaderRedirects.patch -- 2.7.4 diff --git a/package/liblo/0000-server.c-fixHeaderRedirects.patch b/package/liblo/0000-server.c-fixHeaderRedirects.patch new file mode 100644 index 0000000..ae284d2 --- /dev/null +++ b/package/liblo/0000-server.c-fixHeaderRedirects.patch @@ -0,0 +1,13 @@ +diff --git a/src/server.c b/src/server.c +index 01fa08f..11c62d2 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -51,7 +51,7 @@ + #include + #include + #ifdef HAVE_POLL +-#include ++#include + #endif + #include + #include diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index 14b0527..7332334 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -11,7 +11,16 @@ LIBLO_LICENSE = LGPL-2.1+ LIBLO_LICENSE_FILES = COPYING LIBLO_INSTALL_STAGING = YES -# IPv6 support broken, issue known upstream -LIBLO_CONF_OPTS = --disable-ipv6 +# IPv6 support broken, issue known upstream. +# wError - not needed for release. +LIBLO_CONF_OPTS += \ + --disable-ipv6 \ + --disable-werror + +# Liblo uses atomics, so we need to link with +# libatomic for the architectures who explicitly need libatomic. +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) + LIBLO_CONF_ENV += LIBS="-latomic" +endif $(eval $(autotools-package))