summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2012-02-22 14:30:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2012-02-22 14:30:47 +0100
commit8a6ac41263acc6aa8960e9a941a3b0bdf328b7f1 (patch)
treefbcd2beb68fa30de2febdf1317b90b2d2397e711
parentfee514590fb17e73e05c397cdd265fd04320dee7 (diff)
fix building of grub
-rw-r--r--package/grub/Makefile7
-rw-r--r--package/grub/patches/patch-conf_common_mk4
2 files changed, 9 insertions, 2 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 38c3c326e..706bf626e 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -14,11 +14,18 @@ PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/
PKG_HOST_DEPENDS:= linux
PKG_ARCH_DEPENDS:= x86 x86_64
+PKG_NOPARALLEL:= 1
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+= -static
+TARGET_LDFLAGS+= -static
+endif
+
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s CPPFLAGS_FOR_BUILD="-I./include"
CONFIGURE_ARGS+= --disable-efiemu \
--disable-grub-mkfont \
--disable-grub-fstest
diff --git a/package/grub/patches/patch-conf_common_mk b/package/grub/patches/patch-conf_common_mk
index ea4ffc0df..fec7cd1dd 100644
--- a/package/grub/patches/patch-conf_common_mk
+++ b/package/grub/patches/patch-conf_common_mk
@@ -1,11 +1,11 @@
--- grub-1.98.orig/conf/common.mk 2010-03-06 21:52:26.000000000 +0100
-+++ grub-1.98/conf/common.mk 2010-06-26 18:20:29.307157138 +0200
++++ grub-1.98/conf/common.mk 2012-02-22 13:20:42.022360300 +0100
@@ -11159,7 +11159,7 @@ trigtables.c: gentrigtables
./gentrigtables > $@
DISTCLEANFILES += trigtables.c
gentrigtables: gentrigtables.c
- $(CC) -o $@ $^ $(CPPFLAGS) -lm
-+ $(HOSTCC) -o $@ $^ $(CPPFLAGS) -lm
++ $(CC_FOR_BUILD) -o $@ $^ $(CPPFLAGS_FOR_BUILD) -lm
DISTCLEANFILES += gentrigtables
pkglib_MODULES += setjmp.mod