diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2019-12-23 11:28:01 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2019-12-23 11:30:23 -0500 |
| commit | 54816fed63de0f99741f8e38b1a3f8748a02515c (patch) | |
| tree | d4f04c0cb7c6b24328364a5815ffa8348c75a052 /sys-libs | |
| parent | profiles: drop chromium mask (diff) | |
| download | gentoo-54816fed63de0f99741f8e38b1a3f8748a02515c.tar.gz gentoo-54816fed63de0f99741f8e38b1a3f8748a02515c.tar.bz2 gentoo-54816fed63de0f99741f8e38b1a3f8748a02515c.zip | |
Revert "sys-libs/efivar: fix compiling makeguids on older hosts"
This reverts commit e380cf8427ba5f3c073491bdf88488c04beeff6b, which
broke compilation on ia64.
Bug: https://bugs.gentoo.org/702584
Closes: https://bugs.gentoo.org/703536
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/efivar/efivar-37.ebuild (renamed from sys-libs/efivar/efivar-37-r1.ebuild) | 4 | ||||
| -rw-r--r-- | sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch | 36 |
2 files changed, 0 insertions, 40 deletions
diff --git a/sys-libs/efivar/efivar-37-r1.ebuild b/sys-libs/efivar/efivar-37.ebuild index 878309f4b43a..f9a608e46d22 100644 --- a/sys-libs/efivar/efivar-37-r1.ebuild +++ b/sys-libs/efivar/efivar-37.ebuild @@ -19,10 +19,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/${P}-makeguids_fix_host_compile.patch" -) - src_prepare() { default sed -i -e 's/-Werror //' gcc.specs || die 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 deleted file mode 100644 index f0172eb612eb..000000000000 --- a/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 81346196bb262156fd436c78323d161af61dd6c1 Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov <dtor@chromium.org> -Date: Tue, 6 Aug 2019 09:22:25 -0700 -Subject: [PATCH] Make sure makeguids helper is compiled for the host's arch - -Currently makeguids is compiled with the same flags/settings as the rest -of the package, which does not work in case of cross-compiles when arch -of the build host and the target host are different. Let's force -compiling for the native host arch to avoid this issue. - -Note that this is not a full cross-compile solution as this does not -account for potential differences in host/target compilers (versions, -clang vs gcc, etc), but it removes one of the issue with package build -aborting due to invalid instruction on the host. - -Signed-off-by: Dmitry Torokhov <dtor@chromium.org> ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index addfaa0..3729d2b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -52,7 +52,7 @@ include/efivar/efivar-guids.h : makeguids guids.txt - ./makeguids guids.txt guids.bin names.bin \ - guid-symbols.c include/efivar/efivar-guids.h - --makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT -+makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT -march=native - makeguids : LIBS=dl - makeguids : $(MAKEGUIDS_SOURCES) - makeguids : CCLD=$(CCLD_FOR_BUILD) --- -2.23.0.866.gb869b98d4c-goog - |