diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2012-02-25 13:07:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2012-02-25 13:07:27 +0100 |
| commit | 2d57a9a86f13576b1830aacfc82b0e416233decb (patch) | |
| tree | aaca699b7ec68d8fa5b77674b479b3ce9301d378 | |
| parent | b74dd7667a321e1c0b6d6e323ce72d704a912a58 (diff) | |
| parent | 8a6ac41263acc6aa8960e9a941a3b0bdf328b7f1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/grub/Makefile | 7 | ||||
| -rw-r--r-- | package/grub/patches/patch-conf_common_mk | 4 |
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 |