Fix building dibbler package with GCC-10

This commit is contained in:
sean-lau 2021-08-06 14:57:47 +08:00
parent 3794c2d1b2
commit c613fb004e
2 changed files with 46 additions and 3 deletions

View File

@ -0,0 +1,40 @@
From 6f15782cb7d559f1d7e66351a0216048693c9aac Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomek@isc.org>
Date: Thu, 23 Jul 2020 23:41:25 +0200
Subject: [PATCH] Fixed compatibility with gcc-10
---
Port-linux/interface.c | 4 ++++
Port-linux/interface.h | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Port-linux/interface.c b/Port-linux/interface.c
index 3e239d3a..18777e91 100644
--- a/Port-linux/interface.c
+++ b/Port-linux/interface.c
@@ -43,6 +43,10 @@
#include <linux/sockios.h>
#include <linux/if_ether.h>
+int interface_auto_up = 0;
+int interface_do_message = 0;
+
+
void daemon_log(int loglevel, const char *fmt,...)
{
char buf[255];
diff --git a/Port-linux/interface.h b/Port-linux/interface.h
index e986eed3..7c4a54d5 100644
--- a/Port-linux/interface.h
+++ b/Port-linux/interface.h
@@ -23,8 +23,8 @@
extern "C" {
#endif
-int interface_auto_up;
-int interface_do_message;
+extern int interface_auto_up;
+extern int interface_do_message;
typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;

View File

@ -9,12 +9,12 @@ granting) autoconfiguration for IPv6.
Name: dibbler
Version: 1.0.1
Release: 1%{?dist}
Release: 2
Summary: Portable DHCPv6 implementation
License: GPLv2
URL: https://github.com/tomaszmrugalski/dibbler
Source0: http://klub.com.pl/dhcpv6/dibbler/dibbler-%{version}.tar.gz
Patch0: dibbler-1.0.1-fno-common.patch
BuildRequires: gcc-c++
%description
@ -73,7 +73,7 @@ This package contains dibbler documentation.
%prep
%setup -q -n dibbler-%{version}
%autosetup -n dibbler-%{version} -p1
%build
@ -152,6 +152,9 @@ done
%{_pkgdocdir}/scripts/*
%changelog
* Fri Aug 06 2021 liusheng <liusheng2048@gmail.com> - 1.0.1-2
- Fix building with GCC-10
* Tue Feb 23 2021 liusheng <liusheng2048@gmail.com>
- Initial package