efibootmrg: Allow build with uClibc
Details at https://github.com/rhinstaller/efibootmgr/issues/61. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> [Thomas: efivar still doesn't build on musl, so same for efibootmgr.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
64551a8f5f
commit
3ae07b4746
40
package/efibootmgr/0001-Allow-build-with-uClibc.patch
Normal file
40
package/efibootmgr/0001-Allow-build-with-uClibc.patch
Normal file
|
@ -0,0 +1,40 @@
|
|||
From bbfcc60497c326576bb23cb01d90115ef3cf6947 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
Date: Fri, 25 Nov 2016 20:26:52 +0200
|
||||
Subject: [PATCH] Remove unneeded <uchar.h> include
|
||||
|
||||
This fixes the build with uClibc.
|
||||
|
||||
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
---
|
||||
src/efibootdump.c | 1 -
|
||||
src/eficonman.c | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/efibootdump.c b/src/efibootdump.c
|
||||
index 6ff8360..7c5a1c5 100644
|
||||
--- a/src/efibootdump.c
|
||||
+++ b/src/efibootdump.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <uchar.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "error.h"
|
||||
diff --git a/src/eficonman.c b/src/eficonman.c
|
||||
index 2c2be38..9bfae79 100644
|
||||
--- a/src/eficonman.c
|
||||
+++ b/src/eficonman.c
|
||||
@@ -17,7 +17,6 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <uchar.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define _(String) gettext (String)
|
||||
--
|
||||
2.10.2
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
config BR2_PACKAGE_EFIBOOTMGR
|
||||
bool "efibootmgr"
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # efivar
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # efivar
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # efivar
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
|
||||
select BR2_PACKAGE_EFIVAR
|
||||
help
|
||||
A Linux user-space application to modify the Intel Extensible
|
||||
|
@ -14,9 +15,9 @@ config BR2_PACKAGE_EFIBOOTMGR
|
|||
|
||||
https://github.com/rhinstaller/efibootmgr
|
||||
|
||||
comment "efibootmgr requires a glibc toolchain w/ headers >= 3.12, gcc >= 4.9"
|
||||
comment "efibootmgr requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC || \\
|
||||
BR2_TOOLCHAIN_USES_MUSL || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
|
|
|
@ -8,7 +8,8 @@ EFIBOOTMGR_VERSION = 14
|
|||
EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION))
|
||||
EFIBOOTMGR_LICENSE = GPLv2+
|
||||
EFIBOOTMGR_LICENSE_FILES = COPYING
|
||||
EFIBOOTMGR_DEPENDENCIES = efivar
|
||||
EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext)
|
||||
EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl)
|
||||
|
||||
define EFIBOOTMSR_PATCH_HEADER_PATH
|
||||
$(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile
|
||||
|
@ -17,11 +18,12 @@ endef
|
|||
EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH
|
||||
|
||||
define EFIBOOTMGR_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
|
||||
LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D)
|
||||
endef
|
||||
|
||||
define EFIBOOTMGR_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
DESTDIR=$(TARGET_DIR) install
|
||||
endef
|
||||
|
||||
|
|
Loading…
Reference in a new issue