From patchwork Thu Sep 24 20:31:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1370863 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rX3b0zYt; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4By6Cc3vLrz9sS8 for ; Fri, 25 Sep 2020 06:31:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0926E2034A; Thu, 24 Sep 2020 20:31:53 +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 EddsQCqxRbou; Thu, 24 Sep 2020 20:31:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 09E652039A; Thu, 24 Sep 2020 20:31:49 +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 704031BF2EC for ; Thu, 24 Sep 2020 20:31:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6AD2086BB0 for ; Thu, 24 Sep 2020 20:31:47 +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 d0ijsO5HJPXJ for ; Thu, 24 Sep 2020 20:31:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8C8F186B95 for ; Thu, 24 Sep 2020 20:31:46 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id g4so775412wrs.5 for ; Thu, 24 Sep 2020 13:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=06WYCARFQuHaca4wnHvGgjpln0lorX24YarLj2OJ4eM=; b=rX3b0zYt2579vG/wDhCuOpzMfCZNdTuhYr1ZlA54KQtkOjuopMUUTw2WLEPuyEtwG8 DO0bYnTf01GcdlqRdPCNm5QQ5VBWnMm+zh3QE1tHmg4RLrlhGa+14abLUf73yYBp1tv6 8PIf81Vhrjv9OMWovEp4oyFeOVUxyOe6rVjR/nnmmDZxbs6ioblnBTYyB0pepEY+a0Fr UIO2sKHY9gidVR1VzwTuDdMHSoiSrnwOFLvxXYw7kfSZ8itiCF151DgZPPkyLdlF+DnT tvAl8iEI+0pSG2rNUclJbbmfomqFuDPU2Df+2yVvmVUCj+7rZGfLBBBiTydc0UqKEwso DerA== 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:mime-version :content-transfer-encoding; bh=06WYCARFQuHaca4wnHvGgjpln0lorX24YarLj2OJ4eM=; b=NsWK19jIFc4+76n/cgFnlIgbAIpH/RBwOPfuh3Xbcs1BG1vHnG8T++1z+5VOzKYwg9 erXsnspDIChHrbrzgA1OxhzN386PplxEQBxrEk6cuN3KtHfoMIFe/4hPajWFoFL82mta ezKYptISe/Lhf8y7czo0Y4smCzzBiVWuVhOvR0S2GsgxgnYFh0vuh7/pdFJFPUWVM+U/ n7Ut09OLq1G7sLTtedtTt0DnpFN/xZIGlMnggEn4fJezfFezrl1O61OjowDrxpOfglaM Ddj6V+7SPrq+m+e/4gFQOcK87i8ZH7N1niWeiHcapMEvnmbHOhp1MrOO8E7d149Wcd97 c1ZA== X-Gm-Message-State: AOAM532OI0O3mHPS+oB2RUQy2nYXYecAw2tTexdQUMKpWbfvUO9oWntM 4Mma4a877z8p7KG03UA+1eG6LL8zmso= X-Google-Smtp-Source: ABdhPJyu1/KeWN2x8Hjll3YWkubTNDCidwrkiii4zs+9+CjLPc3iq5aTjDXt0wPdef0B4jEEYVD/qg== X-Received: by 2002:a5d:4c86:: with SMTP id z6mr677082wrs.23.1600979504618; Thu, 24 Sep 2020 13:31:44 -0700 (PDT) Received: from kali.home (2a01cb0881b76d0062c55ff6bf2a37aa.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:62c5:5ff6:bf2a:37aa]) by smtp.gmail.com with ESMTPSA id l19sm444757wmi.8.2020.09.24.13.31.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 13:31:43 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 24 Sep 2020 22:31:33 +0200 Message-Id: <20200924203133.2031332-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/openswan: fix build with gcc 10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/650fc0046fd063c70e17ce5ebd9592195657434d Signed-off-by: Fabrice Fontaine --- .../openswan/0001-fix-build-with-gcc-10.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/openswan/0001-fix-build-with-gcc-10.patch diff --git a/package/openswan/0001-fix-build-with-gcc-10.patch b/package/openswan/0001-fix-build-with-gcc-10.patch new file mode 100644 index 0000000000..eb474b56aa --- /dev/null +++ b/package/openswan/0001-fix-build-with-gcc-10.patch @@ -0,0 +1,49 @@ +From 3324d5ab1d00920ea46f453240da1356e0639e98 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Sep 2020 21:55:31 +0200 +Subject: [PATCH] fix build with gcc 10 + +Define kw_host_list and kw_connaddrfamily_list as extern to avoid the following +build failure with gcc 10 (which defaults to -fno-common): + +/home/peko/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: initiate.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: multiple definition of `kw_host_list'; connections.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: first defined here + +Fixes: + - http://autobuild.buildroot.org/results/650fc0046fd063c70e17ce5ebd9592195657434d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xelerance/Openswan/pull/444] +--- + include/ipsecconf/keywords.h | 2 +- + include/pluto_constants.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/ipsecconf/keywords.h b/include/ipsecconf/keywords.h +index e32be7968..02e8e073e 100644 +--- a/include/ipsecconf/keywords.h ++++ b/include/ipsecconf/keywords.h +@@ -314,7 +314,7 @@ struct config_parsed { + bool got_default; + }; + +-const struct keyword_enum_values kw_connaddrfamily_list; ++extern const struct keyword_enum_values kw_connaddrfamily_list; + + extern struct keyword_def ipsec_conf_keywords_v2[]; + extern const int ipsec_conf_keywords_v2_count; +diff --git a/include/pluto_constants.h b/include/pluto_constants.h +index c35dd9576..dcbd3b5b4 100644 +--- a/include/pluto_constants.h ++++ b/include/pluto_constants.h +@@ -665,7 +665,7 @@ enum keyword_host { + KH_IPADDR = LOOSE_ENUM_OTHER, + }; + /* keyword_name(&kw_host_list, type, buffer[KEYWORD_NAME_BUFLEN]) */ +-struct keyword_enum_values kw_host_list; ++extern struct keyword_enum_values kw_host_list; + #define KH_ISWILDCARD(type) ((type) == KH_ANY || (type) == KH_DEFAULTROUTE) + #define KH_ISKNOWNADDR(type) ((type) == KH_IPADDR || (type)==KH_IFACE) + +-- +2.28.0 +