From patchwork Tue Sep 6 09:38:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 666437 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3sT1l24h6Nz9s3s for ; Tue, 6 Sep 2016 19:39:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 09C0E89455; Tue, 6 Sep 2016 09:39:07 +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 HFO4L2K3bKhp; Tue, 6 Sep 2016 09:39:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 077DF89389; Tue, 6 Sep 2016 09:39:03 +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 644EA1CE668 for ; Tue, 6 Sep 2016 09:39:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5DF9289F20 for ; Tue, 6 Sep 2016 09:39:01 +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 ZM+lUXb9Aymy for ; Tue, 6 Sep 2016 09:38:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from lupi.sysmic.org (sysmic.org [62.210.89.17]) by whitealder.osuosl.org (Postfix) with ESMTPS id D9C4789D42 for ; Tue, 6 Sep 2016 09:38:58 +0000 (UTC) Received: from lupi.online.net (sysmic.org [62.210.89.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jezz) by lupi.sysmic.org (Postfix) with ESMTPSA id 9AA4141560; Tue, 6 Sep 2016 11:38:56 +0200 (CEST) From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= To: buildroot@busybox.net Date: Tue, 6 Sep 2016 11:38:54 +0200 Message-Id: <1473154734-10464-1-git-send-email-jezz@sysmic.org> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: Thomas Petazzoni , Judd Meinders , =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Subject: [Buildroot] [PATCH] lxc: use uptream patch to handle --disable-werror 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" This new patch does change behavior, but it was accepted by upstream and could be removed on next version bump. Signed-off-by: Jérôme Pouiller --- .../lxc/0001-configure-add-disable-werror.patch | 49 ++++++++++++++++++++++ package/lxc/0001-drop-werror.patch | 16 ------- package/lxc/lxc.mk | 2 +- 3 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 package/lxc/0001-configure-add-disable-werror.patch delete mode 100644 package/lxc/0001-drop-werror.patch diff --git a/package/lxc/0001-configure-add-disable-werror.patch b/package/lxc/0001-configure-add-disable-werror.patch new file mode 100644 index 0000000..7bd9729 --- /dev/null +++ b/package/lxc/0001-configure-add-disable-werror.patch @@ -0,0 +1,49 @@ +From e9f34eb4e25fc18411121c4e55557530ddc1f49c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= +Date: Sun, 4 Sep 2016 09:35:44 +0200 +Subject: [PATCH] configure: add --disable-werror +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +-Werror may break builds on some scenarios with trivialities +(especially during developments). + +Upstream status: accepted (https://github.com/lxc/lxc/pull/1168) + +Signed-off-by: Jérôme Pouiller +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 39e313a..0103579 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,11 @@ if test "x$with_systemdsystemunitdir" != "xno"; then + AC_SUBST([SYSTEMD_UNIT_DIR], [$with_systemdsystemunitdir]) + fi + ++AC_ARG_ENABLE([werror], ++ [AC_HELP_STRING([--disable-werror], ++ [do not treat warnings as errors])], ++ [], [enable_werror=yes]) ++ + # Allow enabling deprecated executables + AC_ARG_ENABLE([deprecated], + [AC_HELP_STRING([--enable-deprecated], +@@ -630,7 +635,10 @@ AC_PROG_SED + LXC_CHECK_TLS + + if test "x$GCC" = "xyes"; then +- CFLAGS="$CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS -Wall" ++ if test "x$enable_werror" = "xyes"; then ++ CFLAGS="$CFLAGS -Werror" ++ fi + fi + + # Files requiring some variable expansion +-- +2.8.1 + diff --git a/package/lxc/0001-drop-werror.patch b/package/lxc/0001-drop-werror.patch deleted file mode 100644 index d2a8673..0000000 --- a/package/lxc/0001-drop-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -Don't do -Werror it breaks builds on some scenarios with trivialities. - -Signed-off-by: Gustavo Zacarias - -diff -Nura lxc-lxc-1.0.4/configure.ac lxc-lxc-1.0.4.orig/configure.ac ---- lxc-lxc-1.0.4.orig/configure.ac 2014-07-04 10:31:19.821029891 -0300 -+++ lxc-lxc-1.0.4/configure.ac 2014-06-13 14:07:45.000000000 -0300 -@@ -560,7 +560,7 @@ - LXC_CHECK_TLS - - if test "x$GCC" = "xyes"; then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - fi - - # Files requiring some variable expansion diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index a3e24b4..9e21fc0 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -12,7 +12,7 @@ LXC_DEPENDENCIES = libcap host-pkgconf # we're patching configure.ac LXC_AUTORECONF = YES LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ - --disable-lua --disable-python \ + --disable-lua --disable-python --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)