1 |
commit: 54816fed63de0f99741f8e38b1a3f8748a02515c |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 23 16:28:01 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 23 16:30:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54816fed |
7 |
|
8 |
Revert "sys-libs/efivar: fix compiling makeguids on older hosts" |
9 |
|
10 |
This reverts commit e380cf8427ba5f3c073491bdf88488c04beeff6b, which |
11 |
broke compilation on ia64. |
12 |
|
13 |
Bug: https://bugs.gentoo.org/702584 |
14 |
Closes: https://bugs.gentoo.org/703536 |
15 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
16 |
|
17 |
.../{efivar-37-r1.ebuild => efivar-37.ebuild} | 4 --- |
18 |
.../efivar-37-makeguids_fix_host_compile.patch | 36 ---------------------- |
19 |
2 files changed, 40 deletions(-) |
20 |
|
21 |
diff --git a/sys-libs/efivar/efivar-37-r1.ebuild b/sys-libs/efivar/efivar-37.ebuild |
22 |
similarity index 92% |
23 |
rename from sys-libs/efivar/efivar-37-r1.ebuild |
24 |
rename to sys-libs/efivar/efivar-37.ebuild |
25 |
index 878309f4b43..f9a608e46d2 100644 |
26 |
--- a/sys-libs/efivar/efivar-37-r1.ebuild |
27 |
+++ b/sys-libs/efivar/efivar-37.ebuild |
28 |
@@ -19,10 +19,6 @@ DEPEND="${RDEPEND} |
29 |
virtual/pkgconfig |
30 |
" |
31 |
|
32 |
-PATCHES=( |
33 |
- "${FILESDIR}/${P}-makeguids_fix_host_compile.patch" |
34 |
-) |
35 |
- |
36 |
src_prepare() { |
37 |
default |
38 |
sed -i -e 's/-Werror //' gcc.specs || die |
39 |
|
40 |
diff --git a/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch b/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch |
41 |
deleted file mode 100644 |
42 |
index f0172eb612e..00000000000 |
43 |
--- a/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch |
44 |
+++ /dev/null |
45 |
@@ -1,36 +0,0 @@ |
46 |
-From 81346196bb262156fd436c78323d161af61dd6c1 Mon Sep 17 00:00:00 2001 |
47 |
-From: Dmitry Torokhov <dtor@××××××××.org> |
48 |
-Date: Tue, 6 Aug 2019 09:22:25 -0700 |
49 |
-Subject: [PATCH] Make sure makeguids helper is compiled for the host's arch |
50 |
- |
51 |
-Currently makeguids is compiled with the same flags/settings as the rest |
52 |
-of the package, which does not work in case of cross-compiles when arch |
53 |
-of the build host and the target host are different. Let's force |
54 |
-compiling for the native host arch to avoid this issue. |
55 |
- |
56 |
-Note that this is not a full cross-compile solution as this does not |
57 |
-account for potential differences in host/target compilers (versions, |
58 |
-clang vs gcc, etc), but it removes one of the issue with package build |
59 |
-aborting due to invalid instruction on the host. |
60 |
- |
61 |
-Signed-off-by: Dmitry Torokhov <dtor@××××××××.org> |
62 |
---- |
63 |
- src/Makefile | 2 +- |
64 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
65 |
- |
66 |
-diff --git a/src/Makefile b/src/Makefile |
67 |
-index addfaa0..3729d2b 100644 |
68 |
---- a/src/Makefile |
69 |
-+++ b/src/Makefile |
70 |
-@@ -52,7 +52,7 @@ include/efivar/efivar-guids.h : makeguids guids.txt |
71 |
- ./makeguids guids.txt guids.bin names.bin \ |
72 |
- guid-symbols.c include/efivar/efivar-guids.h |
73 |
- |
74 |
--makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT |
75 |
-+makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT -march=native |
76 |
- makeguids : LIBS=dl |
77 |
- makeguids : $(MAKEGUIDS_SOURCES) |
78 |
- makeguids : CCLD=$(CCLD_FOR_BUILD) |
79 |
--- |
80 |
-2.23.0.866.gb869b98d4c-goog |
81 |
- |