From 52b846eecf3eed093b665891bf39ca54e0ee8c87 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 1 Mar 2022 06:10:46 -0500 Subject: [PATCH] import plotnetcfg-0.4.1-18.el9 --- SOURCES/0001-Pass-LDFLAGS-to-the-linker.patch | 27 +++++++++++++++++++ SPECS/plotnetcfg.spec | 11 +++++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 SOURCES/0001-Pass-LDFLAGS-to-the-linker.patch diff --git a/SOURCES/0001-Pass-LDFLAGS-to-the-linker.patch b/SOURCES/0001-Pass-LDFLAGS-to-the-linker.patch new file mode 100644 index 0000000..a6bf975 --- /dev/null +++ b/SOURCES/0001-Pass-LDFLAGS-to-the-linker.patch @@ -0,0 +1,27 @@ +From c6868e91438ed81257b939f0a36c1abeda207c26 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Benc +Date: Thu, 17 Feb 2022 16:28:06 +0100 +Subject: [PATCH] Pass LDFLAGS to the linker + +Signed-off-by: Jiri Benc +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0423f3198c09..54d7aa552f1b 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ plotnetcfg: args.o ethtool.o frontend.o handler.o if.o label.o main.o match.o ne + handlers/bridge.o handlers/master.o handlers/openvswitch.o handlers/veth.o \ + handlers/vlan.o \ + frontends/dot.o frontends/json.o +- gcc -o $@ $+ $(libs) ++ gcc $(LDFLAGS) -o $@ $+ $(libs) + + args.o: args.c args.h + ethtool.o: ethtool.c ethtool.h +-- +2.34.1 + diff --git a/SPECS/plotnetcfg.spec b/SPECS/plotnetcfg.spec index 4650ec5..3d5160e 100644 --- a/SPECS/plotnetcfg.spec +++ b/SPECS/plotnetcfg.spec @@ -3,12 +3,13 @@ Name: plotnetcfg Version: 0.4.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A tool to plot network configuration License: GPLv2+ URL: https://github.com/jbenc/plotnetcfg Source0: https://github.com/jbenc/plotnetcfg/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +Patch0: 0001-Pass-LDFLAGS-to-the-linker.patch BuildRequires: make BuildRequires: gcc, jansson-devel @@ -19,10 +20,11 @@ plotnetcfg is a tool that output a diagram of network configuration on the host in a form suitable for graphviz. %prep -%setup -q -n %{name}-%{commit} +%autosetup -n %{name}-%{commit} %build -make %{?_smp_mflags} CFLAGS="%{optflags}" +%set_build_flags +make %{?_smp_mflags} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" %install %make_install @@ -35,6 +37,9 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" %{_mandir}/man8/* %changelog +* Thu Feb 17 2022 Jiri Benc - 0.4.1-18 +- Fixed build flags [2044887] + * Mon Aug 09 2021 Mohan Boddu - 0.4.1-17 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688