|
 |
0544ba |
From 77604f4e9ca646f1b8234b5d223fb4c8e786c512 Mon Sep 17 00:00:00 2001
|
|
|
ab65a7 |
From: Peter Jones <pjones@redhat.com>
|
|
|
ab65a7 |
Date: Mon, 13 Mar 2017 15:33:54 -0400
|
|
|
ab65a7 |
Subject: [PATCH 1/2] RHEL 7.x popt doesn't have popt.pc, work around its
|
|
|
ab65a7 |
absense.
|
|
|
ab65a7 |
|
|
|
ab65a7 |
Related: rhbz#1380825
|
|
|
ab65a7 |
|
|
|
ab65a7 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
ab65a7 |
---
|
|
|
ab65a7 |
src/Makefile | 10 +++++++---
|
|
|
ab65a7 |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
ab65a7 |
|
|
|
ab65a7 |
diff --git a/src/Makefile b/src/Makefile
|
|
|
0544ba |
index 258bac1c04a..453ddadfca2 100644
|
|
|
ab65a7 |
--- a/src/Makefile
|
|
|
ab65a7 |
+++ b/src/Makefile
|
|
|
ab65a7 |
@@ -21,15 +21,19 @@ ALL_SOURCES=$(EFIBOOTMGR_SOURCES)
|
|
|
ab65a7 |
|
|
|
ab65a7 |
efibootmgr : $(call objects-of,$(EFIBOOTMGR_SOURCES))
|
|
|
ab65a7 |
efibootmgr : PKGS=efivar efiboot
|
|
|
ab65a7 |
+efibootmgr : LIBS=popt
|
|
|
ab65a7 |
|
|
|
ab65a7 |
eficonman : $(call objects-of,$(EFICONMAN_SOURCES))
|
|
|
ab65a7 |
-eficonman : PKGS=efivar efiboot popt
|
|
|
ab65a7 |
+eficonman : PKGS=efivar efiboot
|
|
|
ab65a7 |
+eficonman : LIBS=popt
|
|
|
ab65a7 |
|
|
|
ab65a7 |
efibootdump : $(call objects-of,$(EFIBOOTDUMP_SOURCES))
|
|
|
ab65a7 |
-efibootdump : PKGS=efivar efiboot popt
|
|
|
ab65a7 |
+efibootdump : PKGS=efivar efiboot
|
|
|
ab65a7 |
+efibootdump : LIBS=popt
|
|
|
ab65a7 |
|
|
|
ab65a7 |
efibootnext : $(call objects-of,$(EFIBOOTNEXT_SOURCES))
|
|
|
ab65a7 |
-efibootnext : PKGS=efivar efiboot popt
|
|
|
ab65a7 |
+efibootnext : PKGS=efivar efiboot
|
|
|
ab65a7 |
+efibootnext : LIBS=popt
|
|
|
ab65a7 |
|
|
|
ab65a7 |
deps : $(ALL_SOURCES)
|
|
|
ab65a7 |
$(MAKE) -f $(TOPDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)" SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)"
|
|
|
ab65a7 |
--
|
|
|
0544ba |
2.17.1
|
|
|
ab65a7 |
|