From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Oct 2009 20:13:19 +0000 (+0100)
Subject: Some general build fixes.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6c2d5178a5ba1d1efb685c088f70608feea2809;p=ipfire-3.x.git

Some general build fixes.
---

diff --git a/pkgs/core/bash/bash.nm b/pkgs/core/bash/bash.nm
index 64eff6b89..bed47b0cb 100644
--- a/pkgs/core/bash/bash.nm
+++ b/pkgs/core/bash/bash.nm
@@ -41,6 +41,7 @@ define PKG_DESCRIPTION
 	to conform to the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.
 endef
 
+PKG_BUILD_DEPS+= bison
 PKG_DEPS      += readline
 
 PKG_TARBALL    = $(THISAPP).tar.gz
@@ -99,13 +100,13 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
 $(STAGE_INSTALL): $(STAGE_BUILD)
 	@$(PRE_INSTALL)
 
+	-mkdir -pv $(BUILDROOT)/{bin,etc/profile.d}
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
 	# Bash startup files
 	cp -avf $(DIR_SOURCE)/bash/{bashrc,profile,shells} $(BUILDROOT)/etc
 
 	# /etc/profile.d
-	-mkdir -pv $(BUILDROOT)/etc/profile.d
 	cp -vf $(DIR_SOURCE)/profile.d/* $(BUILDROOT)/etc/profile.d
 
 	@$(POST_INSTALL)
diff --git a/pkgs/core/bzip2/bzip2.nm b/pkgs/core/bzip2/bzip2.nm
index a2dc73b49..4f0954da1 100644
--- a/pkgs/core/bzip2/bzip2.nm
+++ b/pkgs/core/bzip2/bzip2.nm
@@ -77,6 +77,7 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	cd $(DIR_APP) && make PREFIX=$(BUILDROOT)/usr install
 
+	-mkdir -pv $(BUILDROOT)/{bin,lib}
 	cd $(DIR_APP) && cp -v bzip2-shared $(BUILDROOT)/bin/bzip2
 	cd $(DIR_APP) && cp -av libbz2.so* $(BUILDROOT)/lib
 	ln -sfv ../../lib/libbz2.so.1.0 $(BUILDROOT)/usr/lib/libbz2.so
diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/core/coreutils/coreutils.nm
index 3198da0d4..38d459165 100644
--- a/pkgs/core/coreutils/coreutils.nm
+++ b/pkgs/core/coreutils/coreutils.nm
@@ -46,6 +46,8 @@ PKG_TARBALL    = $(THISAPP).tar.gz
 #PKG_PATCHES   += $(THISAPP)-uname_PIC-1.patch
 PKG_PATCHES   += $(THISAPP)-i18n-1.patch
 
+PKG_BUILD_DEPS+= autoconf automake
+
 CFLAGS        += -D_GNU_SOURCE=1 -fno-strict-aliasing
 
 include ../../Rules
@@ -54,6 +56,16 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
+$(STAGE_PREPARE): $(OBJECTS)
+	@$(PRE_PREPARE)
+	cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
+
+	$(DO_PATCHES)
+
+	cd $(DIR_APP) && autoreconf --force
+
+	@$(POST_PREPARE)
+
 $(STAGE_BUILD): $(STAGE_PREPARE)
 	@$(PRE_BUILD)
 
@@ -76,6 +88,7 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
+	-mkdir -pv $(BUILDROOT)/{bin,etc/{pam,profile}.d}
 	mv -v $(BUILDROOT)/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} $(BUILDROOT)/bin
 	mv -v $(BUILDROOT)/usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} $(BUILDROOT)/bin
 	mv -v $(BUILDROOT)/usr/bin/{rmdir,stty,sync,touch,true,uname} $(BUILDROOT)/bin
@@ -86,10 +99,9 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	# Dump /etc/dircolors.
 	dircolors -p > $(BUILDROOT)/etc/dircolors
-	-mkdir -pv $(BUILDROOT)/etc/profile.d
 	cp -vf $(DIR_SOURCE)/profile.d/dircolors.sh $(BUILDROOT)/etc/profile.d
 
 	# PAM
-	cp -vf $(DIR_SOURCE)/pam.d/su{,-l} /etc/pam.d
+	cp -vf $(DIR_SOURCE)/pam.d/su{,-l} $(BUILDROOT)/etc/pam.d
 
 	@$(POST_INSTALL)
diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/core/e2fsprogs/e2fsprogs.nm
index eab5aaa9a..cbb98c1bc 100644
--- a/pkgs/core/e2fsprogs/e2fsprogs.nm
+++ b/pkgs/core/e2fsprogs/e2fsprogs.nm
@@ -40,6 +40,8 @@ define PKG_DESCRIPTION
 	and third extended (ext2/ext3) filesystems.
 endef
 
+PKG_BUILD_DEPS+= pkg-config
+
 PKG_TARBALL    = $(THISAPP).tar.gz
 
 include ../../Rules
diff --git a/pkgs/core/gettext/gettext.nm b/pkgs/core/gettext/gettext.nm
index a7a246dc6..d94b1772b 100644
--- a/pkgs/core/gettext/gettext.nm
+++ b/pkgs/core/gettext/gettext.nm
@@ -47,6 +47,8 @@ define PKG_DESCRIPTION
 	programs.
 endef
 
+PKG_DEPS      += libxml2
+
 PKG_TARBALL    = $(THISAPP).tar.gz
 
 PKG_PATCHES   += $(THISAPP)-open-args-1.patch
diff --git a/pkgs/core/gzip/gzip.nm b/pkgs/core/gzip/gzip.nm
index 5877285cb..1393fe18f 100644
--- a/pkgs/core/gzip/gzip.nm
+++ b/pkgs/core/gzip/gzip.nm
@@ -78,6 +78,7 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
+	-mkdir -pv $(BUILDROOT)/usr/bin
 	mv -v $(BUILDROOT)/bin/{gzexe,uncompress,zcmp,zdiff,zegrep} $(BUILDROOT)/usr/bin
 	mv -v $(BUILDROOT)/bin/{zfgrep,zforce,zgrep,zless,zmore,znew} $(BUILDROOT)/usr/bin
 
diff --git a/pkgs/core/ncurses/ncurses.nm b/pkgs/core/ncurses/ncurses.nm
index 69a352bb1..483b4f5fa 100644
--- a/pkgs/core/ncurses/ncurses.nm
+++ b/pkgs/core/ncurses/ncurses.nm
@@ -72,6 +72,7 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
+	-mkdir -pv $(BUILDROOT)/lib
 	mv -v $(BUILDROOT)/usr/lib/libncursesw.so.5* $(BUILDROOT)/lib
 	ln -sfv ../../lib/libncursesw.so.5 $(BUILDROOT)/usr/lib/libncursesw.so
 	for lib in curses ncurses form panel menu; do \
diff --git a/pkgs/core/patch/patch.nm b/pkgs/core/patch/patch.nm
index 3d226700b..c60eb3c40 100644
--- a/pkgs/core/patch/patch.nm
+++ b/pkgs/core/patch/patch.nm
@@ -51,3 +51,14 @@ PKG_PATCHES   += $(THISAPP)-mkstemp-1.patch
 PKG_PATCHES   += $(THISAPP)-fixes-1.patch
 
 include ../../Rules
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(STAGE_INSTALL): $(STAGE_BUILD)
+	@$(PRE_INSTALL)
+
+	cd $(DIR_APP) && make install prefix=$(BUILDROOT)/usr
+
+	@$(POST_INSTALL)