kernel: modules names changed with kernel 2.6.35

[openwrt.git] / package / grub / Makefile

diff --git a/package/grub/Makefile b/package/grub/Makefile
index e401770..5fd2a23 100644 (file)
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -34,7 +34,6 @@ endef
 
 MY_CONFIGURE_ARGS += \
        --disable-auto-linux-mem-opt \
 
 MY_CONFIGURE_ARGS += \
        --disable-auto-linux-mem-opt \

-       --disable-graphics \

        --disable-hercules \
        --without-curses \
 
        --disable-hercules \
        --without-curses \
 


@@ -45,14 +44,36 @@ CONFIGURE_ARGS += $(MY_CONFIGURE_ARGS)
 
 CONFIGURE_VARS += $(MY_CONFIGURE_VARS)
 
 
 CONFIGURE_VARS += $(MY_CONFIGURE_VARS)
 

+ifeq ($(HOST_OS),Darwin)
+  HOST_CFLAGS += $(call host-cc-option,-m32)
+  HOST_CFLAGS += $(call host-cc-option,-fnested-functions)
+endif
+

 HOST_CFLAGS += $(call host-cc-option,-fno-stack-protector)
 HOST_CFLAGS += $(call host-cc-option,-U_FORTIFY_SOURCE)
 
 HOST_CONFIGURE_ARGS += $(MY_CONFIGURE_ARGS) \
        --sbindir="$(STAGING_DIR_HOST)/bin" \
 HOST_CFLAGS += $(call host-cc-option,-fno-stack-protector)
 HOST_CFLAGS += $(call host-cc-option,-U_FORTIFY_SOURCE)
 
 HOST_CONFIGURE_ARGS += $(MY_CONFIGURE_ARGS) \
        --sbindir="$(STAGING_DIR_HOST)/bin" \

+       --disable-graphics \

 
 HOST_CONFIGURE_VARS += $(MY_CONFIGURE_VARS)
 
 
 HOST_CONFIGURE_VARS += $(MY_CONFIGURE_VARS)
 

+define Host/Configure
+       (cd $(HOST_BUILD_DIR); aclocal && autoconf && automake)
+       $(call Host/Configure/Default)
+endef
+
+ifeq ($(HOST_OS),Darwin)
+  define Host/Compile
+       $(MAKE) -C $(HOST_BUILD_DIR)/lib
+       $(MAKE) -C $(HOST_BUILD_DIR)/stage2 libgrub.a
+       $(MAKE) -C $(HOST_BUILD_DIR)/grub
+  endef
+  define Host/Install
+       $(MAKE) -C $(HOST_BUILD_DIR)/grub install
+  endef
+endif
+

 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/grub $(1)/usr/lib/
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/grub $(1)/usr/lib/