From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 13 Apr 2010 17:32:17 +0000 (+0200)
Subject: grub: Cleanup makefile.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=812a68166ad7439468514965b69928c5785da7d0;p=ipfire-3.x.git

grub: Cleanup makefile.
---

diff --git a/pkgs/core/grub/grub.nm b/pkgs/core/grub/grub.nm
index 2cf83d5a4..f49f71ae1 100644
--- a/pkgs/core/grub/grub.nm
+++ b/pkgs/core/grub/grub.nm
@@ -46,22 +46,12 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.gz
 
-define QUALITY_AGENT_WHITELIST_EXECSTACK
-	/usr/sbin/grub
-endef
-
-#CFLAGS        += -fno-strict-aliasing -fno-stack-protector -fno-pic -fno-pie -nopie
-#CXXFLAGS       =
+QUALITY_AGENT_WHITELIST_NX = /usr/bin/*|/usr/sbin/*
 
-define STAGE_BUILD
-	cd $(DIR_APP) && \
-		grub_cv_prog_objcopy_absolute=yes \
-		./configure \
-			--prefix=/usr \
-			--sysconfdir=/etc
+CFLAGS        += -fno-strict-aliasing
 
-	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-endef
+CONFIGURE_OPTIONS += \
+	--sysconfdir=/etc
 
 define STAGE_INSTALL
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)