[package] ppp:

[openwrt.git] / package / grub / Makefile

diff --git a/package/grub/Makefile b/package/grub/Makefile
index e828ec0..20232f4 100644 (file)
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=grub
 PKG_VERSION:=0.97
 
 PKG_NAME:=grub
 PKG_VERSION:=0.97

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://alpha.gnu.org/gnu/grub
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://alpha.gnu.org/gnu/grub


@@ -31,27 +31,17 @@ define Package/grub
   URL:=http://www.gnu.org/software/grub/
 endef
 
   URL:=http://www.gnu.org/software/grub/
 endef
 

-ifeq ($(HOST_OS),Linux)
-  NATIVEGRUB-i386:=1
-  NATIVEGRUB-i686:=1
-  NATIVEGRUB:=$(NATIVEGRUB-$(HOST_ARCH))
-endif
-
-ifeq ($(NATIVEGRUB),)
-CONFIGURE_FLAGS:= \
-       --target=$(GNU_TARGET_NAME) \
-       --host=$(GNU_TARGET_NAME) \
-       --build=$(GNU_HOST_NAME)
-else
-CONFIGURE_FLAGS:=
-endif
+CONFIGURE_FLAGS:= 

 
 ifneq ($(HOST_OS),Darwin)
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
 
 ifneq ($(HOST_OS),Darwin)
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \

+               CFLAGS="-march=i486 -m32" \

                LDFLAGS="-static" \
                ./configure \
                $(CONFIGURE_FLAGS) \
                LDFLAGS="-static" \
                ./configure \
                $(CONFIGURE_FLAGS) \

+               --build=i386-linux-gnu \
+               --host=i386-linux-gnu \

                --program-prefix="" \
                --program-suffix="" \
                --prefix=/usr \
                --program-prefix="" \
                --program-suffix="" \
                --prefix=/usr \