remove useless patch.
This commit is contained in:
parent
4f0f5f255c
commit
acdbcc9efb
@ -1,45 +0,0 @@
|
|||||||
From f229181c015f7353602e6b32e6ed61f9b47480ae Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
|
|
||||||
Date: Thu, 12 Apr 2018 12:58:51 +0200
|
|
||||||
Subject: [PATCH] Respect environment CCLDFLAGS
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Allow passing custom flags for the linker.
|
|
||||||
|
|
||||||
Signed-off-by: Petr Šabata <contyk@redhat.com>
|
|
||||||
---
|
|
||||||
Make.defaults | 2 +-
|
|
||||||
src/Makefile | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Make.defaults b/Make.defaults
|
|
||||||
index 9bfa5b2..1030be9 100644
|
|
||||||
--- a/Make.defaults
|
|
||||||
+++ b/Make.defaults
|
|
||||||
@@ -14,7 +14,7 @@ BUILDFLAGS = $(CFLAGS) -fPIC -fshort-wchar -fno-strict-aliasing \
|
|
||||||
--param=ssp-buffer-size=4 -fexceptions
|
|
||||||
ASFLAGS =
|
|
||||||
LDFLAGS = -nostdlib
|
|
||||||
-CCLDFLAGS = -shared
|
|
||||||
+CCLDFLAGS += -shared
|
|
||||||
INSTALL = install
|
|
||||||
COMPILER ?=
|
|
||||||
|
|
||||||
diff --git a/src/Makefile b/src/Makefile
|
|
||||||
index 1a6277a..669bfab 100644
|
|
||||||
--- a/src/Makefile
|
|
||||||
+++ b/src/Makefile
|
|
||||||
@@ -6,7 +6,7 @@ include $(TOPDIR)/Make.defaults
|
|
||||||
PKLIBS = efivar
|
|
||||||
LIBS = popt
|
|
||||||
LDFLAGS =
|
|
||||||
-CCLDFLAGS = $(foreach pklib,$(PKLIBS), $(shell pkg-config --libs-only-L $(pklib)))
|
|
||||||
+CCLDFLAGS += $(foreach pklib,$(PKLIBS), $(shell pkg-config --libs-only-L $(pklib)))
|
|
||||||
BUILDFLAGS += $(foreach pklib,$(PKLIBS), $(shell pkg-config --cflags $(pklib)))
|
|
||||||
|
|
||||||
TARGETS = dbxtool
|
|
||||||
--
|
|
||||||
2.17.0
|
|
||||||
|
|
||||||
@ -2,12 +2,11 @@
|
|||||||
|
|
||||||
Name: dbxtool
|
Name: dbxtool
|
||||||
Version: 8
|
Version: 8
|
||||||
Release: 9
|
Release: 10
|
||||||
Summary: Tool for managing dbx updates installed on a machine.
|
Summary: Tool for managing dbx updates installed on a machine.
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://github.com/vathpela/dbxtool-devel
|
URL: https://github.com/vathpela/dbxtool-devel
|
||||||
Source0: https://github.com/vathpela/%{name}-devel/archive/%{git_commit_hash}/%{name}-devel-889594f.tar.gz
|
Source0: https://github.com/vathpela/%{name}-devel/archive/%{git_commit_hash}/%{name}-devel-889594f.tar.gz
|
||||||
Patch0: dbxtool-8-ccldflags.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc popt-devel efivar-devel >= 35-1 systemd
|
BuildRequires: gcc popt-devel efivar-devel >= 35-1 systemd
|
||||||
Requires: efivar systemd
|
Requires: efivar systemd
|
||||||
@ -51,6 +50,9 @@ Tool for managing dbx updates installed on a machine.
|
|||||||
%doc %{_mandir}/man1/*
|
%doc %{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 6 2020 openEuler Buildteam <buildteam@openeuler.org> - 8-10
|
||||||
|
- remove useless patch.
|
||||||
|
|
||||||
* Mon Oct 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 8-9
|
* Mon Oct 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 8-9
|
||||||
- Package rebuild.
|
- Package rebuild.
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user