From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Feb 2009 18:55:25 +0000 (+0100)
Subject: Build glib2 with pcre support.
X-Git-Tag: v3.0-alpha1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9c4fe39e08080be57b517d9ca2ec722611d95c4;p=ipfire-3.x.git

Build glib2 with pcre support.
---

diff --git a/lfs/glib2 b/lfs/glib2
index ac8b9ca2d..7c6679e5a 100644
--- a/lfs/glib2
+++ b/lfs/glib2
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Libaries
 EXTRA      = no
 DEBUG      = no
-DEPS       = pkg-config
+DEPS       = pcre pkg-config
 
 URL        = http://www.gtk.org
 LICENSE    = LGPLv2+
@@ -81,7 +81,8 @@ $(OBJECT): $(objects)
 	cd $(DIR_APP) && \
 		./configure \
 			$(CONFIGURE_ARCH) \
-			--prefix=/usr
+			--prefix=/usr \
+			--with-pcre=system
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && ./mkinstalldirs /lib
diff --git a/lfs/pcre b/lfs/pcre
index 8a758596d..8a6e5b905 100644
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -33,6 +33,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+DEPS       = bzip2 zlib
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
diff --git a/make.sh b/make.sh
index 1111ec815..4c2be7e06 100755
--- a/make.sh
+++ b/make.sh
@@ -88,6 +88,7 @@ toolchain_build() {
 	toolchain_make util-linux-ng
 	toolchain_make strip
 	export PATH=$ORG_PATH SKIP_PACKAGE_LIST=$SAVE_SKIP_PACKAGE_LIST
+	unset SAVE_SKIP_PACKAGE_LIST
 }
 
 ################################################################################
@@ -129,6 +130,8 @@ base_build() {
 	ipfire_make gettext
 	ipfire_make make
 	ipfire_make libidn
+	ipfire_make bzip2
+	ipfire_make pcre
 	ipfire_make pkg-config
 	ipfire_make attr
 	ipfire_make libcap2
@@ -136,7 +139,6 @@ base_build() {
 	ipfire_make autoconf
 	ipfire_make automake
 	ipfire_make bash
-	ipfire_make bzip2
 	ipfire_make diffutils
 	ipfire_make eventlog
 	ipfire_make file
@@ -194,7 +196,6 @@ ipfire_build() {
 	### Building some general stuff
 	#   STAGE 1
 	ipfire_make libdaemon
-	ipfire_make pcre
 	ipfire_make expat
 	ipfire_make dbus
 	ipfire_make dbus-glib
@@ -308,7 +309,7 @@ ipfire_build() {
 	ipfire_make which
 	ipfire_make screen
 	ipfire_make rrdtool
-	ipfire_make ntp			### Needs config.
+	ipfire_make ntp
 	ipfire_make openssh
 	ipfire_make ez-ipupdate
 	ipfire_make noip
@@ -321,7 +322,6 @@ ipfire_build() {
 	ipfire_make cdrtools
 	ipfire_make python-parted
 	ipfire_make memtest86+
-	#ipfire_make pakfire
 	ipfire_make quagga
 	#ipfire_make mISDN
 	#ipfire_make wireless