From patchwork Fri Apr 12 16:56:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1084843 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.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.b="p4aY//O3"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44gkZ22mLsz9s55 for ; Sat, 13 Apr 2019 02:56:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9074B88190; Fri, 12 Apr 2019 16:56:18 +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 EVTpg3g7BBVb; Fri, 12 Apr 2019 16:56:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 57F8D88121; Fri, 12 Apr 2019 16:56:16 +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 446EE1BF977 for ; Fri, 12 Apr 2019 16:56:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4159587913 for ; Fri, 12 Apr 2019 16:56:15 +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 JNhAonthKEI8 for ; Fri, 12 Apr 2019 16:56:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id B4E6287931 for ; Fri, 12 Apr 2019 16:56:13 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id k11so12843562wro.5 for ; Fri, 12 Apr 2019 09:56:13 -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=6jkh6rTOjKGhCnyR7BuXpmb8ea/fFKCgRAsTlBt+OoE=; b=p4aY//O3uTHvbxtsN3YKISYvCJvNcwfHqubBv5jNRKHZ0DqWzYIDhjesyArviri4Pi NrYw6CKHP2YJLSJ8m/NvmXVHidcTRnBnT6/xi7JKAsTodQvBDbkIIX744J1fC1BxwJNC FrYiiMMjJ5WQt2N2E3Xnyd7In3qMFQEMiAUpCd0jYHdIyUGH2pUMt1cP8pkh63PltWAq rT4J6G2bh4kYIoHVR0kiCcxdivfV0jjtIDW6HhH33OQ1A01GZeaIV05aG/tsEJ+NHAmG 6lI2/GxHB/kKzCKgmMDFXgVN45Z+Yn51UsWOCERRdpUe3seN6IAfTrAOkgmpqI8Qs9nV 7BwQ== 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=6jkh6rTOjKGhCnyR7BuXpmb8ea/fFKCgRAsTlBt+OoE=; b=M4AuuyT2fNiuJZK269vbhRD281oz2KGQg5gc29a7czFMTNlVHYX9eed0lwTVXtTBz7 34QexxhYMi2gCliawk8i6vmXvlTZW0cEf+SqLTJFOzSKgNt/+9Nt04SSezMAz5F3zl59 SjhicoHCWT0VCPwoByCCGrMJ6DISupWR31Kri4dqP00AMZk0WZaM2Ta3i17Gf+P1IoQO 1OjVMCCn0k/grr60KHoZrxJAg6Zigtopf4lh+ulWOQvrtKdosrCCGpnMqBoasVM9H/UJ mutQcOejGErV0cdyHKblAvazsbCp5cUx6K8OYUPMhV+ruZeHQzo0jA/BURgY+q/aeKUt cQ0A== X-Gm-Message-State: APjAAAXf7+MaJj4tu6hxp5j6lUMxWnMtc1SAUG4vQUhVfgmkWQXFgkvW mZYLTQ3lTIM4mCVgN0QcMUcNVPzB X-Google-Smtp-Source: APXvYqygPPL3F0SsspjMCjX4d6NjU+eOOsK3RlJbMiDqVKKgRb+Lk3hv6fHS/g8Vm025Uh6tp3/gtg== X-Received: by 2002:adf:ed8a:: with SMTP id c10mr29731750wro.40.1555088172037; Fri, 12 Apr 2019 09:56:12 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id v17sm7896045wmc.30.2019.04.12.09.56.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 09:56:11 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 12 Apr 2019 18:56:02 +0200 Message-Id: <20190412165602.29302-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/lldpd: fix build without cdp 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/e46055b86bcb03614f3fba076af2278e46a39714 Signed-off-by: Fabrice Fontaine --- ...lation-with--enable-fdp--disable-cdp.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/lldpd/0001-build-fix-compilation-with--enable-fdp--disable-cdp.patch diff --git a/package/lldpd/0001-build-fix-compilation-with--enable-fdp--disable-cdp.patch b/package/lldpd/0001-build-fix-compilation-with--enable-fdp--disable-cdp.patch new file mode 100644 index 0000000000..575d97d96d --- /dev/null +++ b/package/lldpd/0001-build-fix-compilation-with--enable-fdp--disable-cdp.patch @@ -0,0 +1,35 @@ +From 4e7ec8233cd185941eaa9e41785cfc53f92799b4 Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 8 Jan 2019 17:19:15 -0500 +Subject: [PATCH] build: fix compilation with `--enable-fdp --disable-cdp` + +Fix #315 +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/vincentbernat/lldpd/commit/4e7ec8233cd185941eaa9e41785cfc53f92799b4] +--- + src/lldpd-structs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h +index c3ffa108..f6b03d7d 100644 +--- a/src/lldpd-structs.h ++++ b/src/lldpd-structs.h +@@ -129,7 +129,7 @@ struct lldpd_dot3_power { + MARSHAL(lldpd_dot3_power); + #endif + +-#ifdef ENABLE_CDP ++#if defined (ENABLE_CDP) || defined (ENABLE_FDP) + struct cdpv2_power { + u_int16_t request_id; + u_int16_t management_id; +@@ -273,7 +273,7 @@ struct lldpd_port { + struct lldpd_med_power p_med_power; + #endif + +-#ifdef ENABLE_CDP ++#if defined (ENABLE_CDP) || defined (ENABLE_FDP) + struct cdpv2_power p_cdp_power; + #endif +