X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a85e4d1eb9b4b46b2e4b5372c9f93d24fb125754..02f4867a492aa007738b3c298c9a73a42776ef7a:/package/grub/Makefile

diff --git a/package/grub/Makefile b/package/grub/Makefile
index 20232f495..80b79f29e 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,71 +10,102 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=grub
 PKG_VERSION:=0.97
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://alpha.gnu.org/gnu/grub
 PKG_MD5SUM:=cd3f3eb54446be6003156158d51f4884
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/grub-$(PKG_VERSION)
-PKG_TARGETS:=bin
+PKG_BUILD_DEPENDS:= grub/host
+PKG_INSTALL:=1
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
-export grub_cv_prog_objcopy_absolute=yes
-
 define Package/grub
-  SECTION:=boot
-  DEPENDS:=@TARGET_x86
-  CATEGORY:=Boot Loaders
+  SUBMENU:=Boot Loaders
+  CATEGORY:=Utilities
+  SECTION:=utils
   TITLE:=GRand Unified Bootloader
   URL:=http://www.gnu.org/software/grub/
+  DEPENDS:=@TARGET_x86
 endef
 
-CONFIGURE_FLAGS:= 
-
-ifneq ($(HOST_OS),Darwin)
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		CFLAGS="-march=i486 -m32" \
-		LDFLAGS="-static" \
-		./configure \
-		$(CONFIGURE_FLAGS) \
-		--build=i386-linux-gnu \
-		--host=i386-linux-gnu \
-		--program-prefix="" \
-		--program-suffix="" \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(DISABLE_NLS) \
-		--disable-auto-linux-mem-opt \
-	)
-endef
 
-#
-# ./configure detects whether the host compiler supports
-# -fno-stack-protector but only sets STAGE2_CFLAGS accordingly
-#
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		GRUB_CFLAGS="\$$$$(STAGE2_CFLAGS)" \
-		STAGE1_CFLAGS="\$$$$(STAGE2_CFLAGS)"
+MY_CONFIGURE_ARGS += \
+	--disable-auto-linux-mem-opt \
+	--disable-hercules \
+	--without-curses \
+
+MY_CONFIGURE_VARS += \
+	grub_cv_prog_objcopy_absolute=yes \
+
+CONFIGURE_ARGS += $(MY_CONFIGURE_ARGS)
+
+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
+
+ifeq ($(HOST_OS),FreeBSD)
+  ifeq ($(HOST_ARCH),amd64)
+    HOST_CFLAGS += $(call host-cc-option,-m32)
+    HOST_CFLAGS += $(call host-cc-option,-B/usr/lib32)
+    HOST_CFLAGS += $(call host-cc-option,-L/usr/lib32)
+  endif
+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" \
+	--disable-graphics \
+
+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
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(STAGING_DIR_HOST)" \
-		install
-	mv $(STAGING_DIR_HOST)/usr/sbin/grub $(STAGING_DIR_HOST)/bin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/grub $(1)/usr/lib/
+endef
+
+define Package/grub/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
 endef
+
+ifeq ($(HOST_ARCH),x86_64)
+  define Require/working-gcc-m32
+	echo 'int main(int argc, char **argv) { return 0; }' | \
+		gcc -x c -o $(TMP_DIR)/a.out - -m32 -lc
+  endef
 endif
 
+$(eval $(call Require,working-gcc-m32, \
+	Please install 32 bit development files. (gcc-multilib on Debian/Ubuntu, gcc.i686, libgcc.i686, and glibc-devel.i686 on CentOS/Fedora/RHEL) \
+))
+
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,grub))