Browse Source

fix building of grub

Waldemar Brodkorb 13 years ago
parent
commit
8a6ac41263
2 changed files with 9 additions and 2 deletions
  1. 7 0
      package/grub/Makefile
  2. 2 2
      package/grub/patches/patch-conf_common_mk

+ 7 - 0
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

+ 2 - 2
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