Build glib2 with pcre support.

diff --git a/lfs/glib2 b/lfs/glib2
index ac8b9ca2de5ace7f836237f79d4a7248763f307b..7c6679e5af33c3df85b086ef90b35a6e7efdb181 100644 (file)
--- 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 8a758596dd16759268e2eb2688a255628fec9610..8a6e5b905a5486263d71e5703a10aec822e8fbdc 100644 (file)
--- 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 1111ec8155f956eca7941f2198fd24173352fd76..4c2be7e06fbacee324fe19b3e332debe599b1f52 100755 (executable)
--- 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