Mercurial > vanilla
changeset 429:f88f7c060f11
core/efibootmgr: remove musl-gettext.patch
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Thu, 04 Apr 2019 20:55:00 +0200 |
| parents | ac093cd90702 |
| children | 042b6157c82f |
| files | core/efibootmgr/clang.patch core/efibootmgr/efibootmgr.sh core/efibootmgr/musl-gettext.patch |
| diffstat | 3 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/efibootmgr/clang.patch Thu Apr 04 20:55:00 2019 +0200 @@ -0,0 +1,11 @@ +--- Make.defaults.orig 2018-06-10 22:12:10.000000000 +0200 ++++ Make.defaults 2019-04-04 16:27:22.066304785 +0200 +@@ -35,7 +35,7 @@ + PKGS = + + SUBDIR_CFLAGS ?= +-clang_cflags = ++clang_cflags = `pkgconf --cflags efivar` + gcc_cflags = + cflags = $(EXTRALIBDIR) $(EXTRAINCDIR) $(CFLAGS) $(SUBDIR_CFLAGS) \ + -Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \
--- a/core/efibootmgr/efibootmgr.sh Thu Apr 04 20:50:00 2019 +0200 +++ b/core/efibootmgr/efibootmgr.sh Thu Apr 04 20:55:00 2019 +0200 @@ -35,7 +35,6 @@ patch -p0 < ../clang.patch # https://git.alpinelinux.org/aports/tree/testing/efibootmgr?h=master patch -p1 < ../efivar.patch - patch -p1 < ../musl-gettext.patch CC="$CC" PCDIR=/usr/lib/pkgconfig EFIDIR=/boot/efi make EFIDIR=/boot/efi DESTDIR=$DESTDIR make install
--- a/core/efibootmgr/musl-gettext.patch Thu Apr 04 20:50:00 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- ./Make.defaults.orig -+++ ./Make.defaults -@@ -49,7 +49,7 @@ - $(call pkg-config-ccldflags) - CPPFLAGS?= - SOFLAGS=-shared --LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs) -+LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs) -lintl - - .PHONY: check_efidir_error - check_efidir_error : ; $(EFIDIR_ERROR) $(info Building with EFIDIR as $(EFIDIR))