From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Nov 2009 18:26:04 +0000 (+0100)
Subject: naoki: Misc things.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f150d126f445d389736e212f47009048e8d90b0f;p=ipfire-3.x.git

naoki: Misc things.

A buildfix and some dependency things.
---

diff --git a/pkgs/Include b/pkgs/Include
index 2905adf74..f1db02004 100644
--- a/pkgs/Include
+++ b/pkgs/Include
@@ -58,6 +58,8 @@ define PKG_FILES_devel
 	*/lib/*.so
 endef
 
+PKG_BUILD_DEPS += glibc gcc
+
 CONFIGURE_ARCH = --build=$(TARGET) --host=$(TARGET)
 
 ifeq "$(TARGET_MACHINE)" "x86_64"
diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/core/e2fsprogs/e2fsprogs.nm
index d49761848..27de7556b 100644
--- a/pkgs/core/e2fsprogs/e2fsprogs.nm
+++ b/pkgs/core/e2fsprogs/e2fsprogs.nm
@@ -50,8 +50,8 @@ PKG_TARBALL    = $(THISAPP).tar.gz
 # Installation Details
 ###############################################################################
 
-define STAGE_PREPARE
-	-mkdir $(DIR_APP)/build
+define STAGE_PREPARE_CMDS
+	-mkdir -pv $(DIR_APP)/build
 
 	# Fix DT_TEXTREL in e2fsprogs libraries. --disable-shared and
 	# --with-pic are not options in E2fsprogs:
diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm
index 25b44bf60..37c8265f1 100644
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@ -39,7 +39,8 @@ define PKG_DESCRIPTION
 	You'll need this package in order to compile C code.
 endef
 
-PKG_BUILD_DEPS = binutils glibc kernel-headers
+PKG_BUILD_DEPS =
+PKG_DEPS      += binutils glibc kernel-headers
 
 CFLAGS         = -D__USE_XOPEN2K8 -pipe
 CXXFLAGS       =
@@ -65,8 +66,6 @@ PKG_PATCHES   += $(THISAPP)-espf-1.patch \
 	$(THISAPP)-branch-startfiles-1.patch \
 	$(THISAPP)-asprintf_fix.patch
 
-export CPP = $(TOOLS_DIR)/bin/cpp
-
 ###############################################################################
 # Installation Details
 ###############################################################################
diff --git a/pkgs/core/kernel-headers/kernel-headers.nm b/pkgs/core/kernel-headers/kernel-headers.nm
index 65925aa0e..81d699935 100644
--- a/pkgs/core/kernel-headers/kernel-headers.nm
+++ b/pkgs/core/kernel-headers/kernel-headers.nm
@@ -1,6 +1,8 @@
 
 include ../../core/kernel/kernel.nm
 
+PKG_BUILD_DEPS =
+
 STAGE_PREPARE_CMDS =
 
 define STAGE_BUILD