summaryrefslogtreecommitdiff
path: root/package/grub
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-28 19:17:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-28 19:44:52 +0200
commitef90b40eadcdd3b6d8a0dd80fb04bd653f7fd5c4 (patch)
treed54e7fc4576e5fca933531e0049e9264f43b31b1 /package/grub
parent248c00d7dd21b553613b01293570df0b1ccaa61b (diff)
grub: disable rpath, fix linking under Darwin
Diffstat (limited to 'package/grub')
-rw-r--r--package/grub/Makefile2
-rw-r--r--package/grub/patches/patch-grub-core_Makefile_am10
2 files changed, 12 insertions, 0 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 06644587d..9d0d2d0ef 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -101,11 +101,13 @@ HOST_CONFIGURE_ARGS+= --enable-efiemu=no \
--disable-grub-mkfont \
--enable-device-mapper=no \
--enable-libzfs=no \
+ --disable-rpath \
--disable-werror
CONFIGURE_ARGS+= --disable-grub-mkfont \
--enable-efiemu=no \
--enable-device-mapper=no \
--enable-libzfs=no \
+ --disable-rpath \
--with-platform=$(GRUB_PLATFORM) \
--disable-werror
diff --git a/package/grub/patches/patch-grub-core_Makefile_am b/package/grub/patches/patch-grub-core_Makefile_am
new file mode 100644
index 000000000..1c2fde022
--- /dev/null
+++ b/package/grub/patches/patch-grub-core_Makefile_am
@@ -0,0 +1,10 @@
+--- grub-07662af7aed55bcec448bc2a6610de1f0cb62100.orig/grub-core/Makefile.am 2017-02-12 20:56:32.000000000 +0100
++++ grub-07662af7aed55bcec448bc2a6610de1f0cb62100/grub-core/Makefile.am 2017-03-28 08:00:46.000000000 +0200
+@@ -61,6 +61,7 @@ grub_script.yy.c: grub_script.yy.h
+
+ rs_decoder.h: $(srcdir)/lib/reed_solomon.c
+ $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
++ sed -i -e "s#.*macosx_version_min.*##" $@
+
+ CLEANFILES += grub_script.yy.c grub_script.yy.h
+