From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 8 Jul 2008 20:20:09 +0000 (+0000)
Subject: Removed cpp things from pcre.
X-Git-Tag: v3.0-alpha1~883
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0acbb61cedeace36b82d058d279ab5de8dd45b1;p=ipfire-3.x.git

Removed cpp things from pcre.
---

diff --git a/lfs/pcre b/lfs/pcre
index c11478b6b..d7c38e850 100644
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -56,11 +56,12 @@ $(TARGET) :
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-abi_breakage-1.patch
 
 ifeq "$(STAGE)" "ipfire"
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-						--docdir=/usr/share/doc/pcre-$(VER) \
-						--enable-utf8 \
-						--enable-pcregrep-libz \
-						--enable-pcregrep-libbz2
+	cd $(DIR_APP) && \
+		./configure --prefix=/usr \
+			--docdir=/usr/share/doc/pcre-$(VER) \
+			--enable-utf8 \
+			--enable-pcregrep-libz \
+			--enable-pcregrep-libbz2
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 	mv -v /usr/lib/libpcre.so.* /lib/
@@ -68,10 +69,11 @@ ifeq "$(STAGE)" "ipfire"
 endif
 
 ifeq "$(STAGE)" "installer"
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-						--enable-utf8 \
-						--target=$(UCLIBC_TARGET) \
-						--host=$(UCLIBC_TARGET)
+	cd $(DIR_APP) && \
+		./configure --prefix=/usr \
+			--host=$(UCLIBC_TARGET) \
+			--enable-utf8 \
+			--disable-cpp
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
 endif
diff --git a/src/rootfiles/installer/pcre b/src/rootfiles/installer/pcre
index 6031397db..0a93995c7 100644
--- a/src/rootfiles/installer/pcre
+++ b/src/rootfiles/installer/pcre
@@ -2,28 +2,18 @@
 #INSTALLER_DIR/usr/bin/pcregrep
 #INSTALLER_DIR/usr/bin/pcretest
 #INSTALLER_DIR/usr/include/pcre.h
-#INSTALLER_DIR/usr/include/pcre_scanner.h
-#INSTALLER_DIR/usr/include/pcre_stringpiece.h
-#INSTALLER_DIR/usr/include/pcrecpp.h
-#INSTALLER_DIR/usr/include/pcrecpparg.h
 #INSTALLER_DIR/usr/include/pcreposix.h
 #INSTALLER_DIR/usr/lib/libpcre.a
 #INSTALLER_DIR/usr/lib/libpcre.la
 INSTALLER_DIR/usr/lib/libpcre.so
 INSTALLER_DIR/usr/lib/libpcre.so.0
 INSTALLER_DIR/usr/lib/libpcre.so.0.0.1
-#INSTALLER_DIR/usr/lib/libpcrecpp.a
-#INSTALLER_DIR/usr/lib/libpcrecpp.la
-INSTALLER_DIR/usr/lib/libpcrecpp.so
-INSTALLER_DIR/usr/lib/libpcrecpp.so.0
-INSTALLER_DIR/usr/lib/libpcrecpp.so.0.0.0
 #INSTALLER_DIR/usr/lib/libpcreposix.a
 #INSTALLER_DIR/usr/lib/libpcreposix.la
 INSTALLER_DIR/usr/lib/libpcreposix.so
 INSTALLER_DIR/usr/lib/libpcreposix.so.0
 INSTALLER_DIR/usr/lib/libpcreposix.so.0.0.0
 #INSTALLER_DIR/usr/lib/pkgconfig/libpcre.pc
-#INSTALLER_DIR/usr/lib/pkgconfig/libpcrecpp.pc
 #INSTALLER_DIR/usr/share/doc
 #INSTALLER_DIR/usr/share/doc/pcre
 #INSTALLER_DIR/usr/share/doc/pcre/AUTHORS
@@ -60,7 +50,6 @@ INSTALLER_DIR/usr/lib/libpcreposix.so.0.0.0
 #INSTALLER_DIR/usr/share/doc/pcre/html/pcrebuild.html
 #INSTALLER_DIR/usr/share/doc/pcre/html/pcrecallout.html
 #INSTALLER_DIR/usr/share/doc/pcre/html/pcrecompat.html
-#INSTALLER_DIR/usr/share/doc/pcre/html/pcrecpp.html
 #INSTALLER_DIR/usr/share/doc/pcre/html/pcregrep.html
 #INSTALLER_DIR/usr/share/doc/pcre/html/pcrematching.html
 #INSTALLER_DIR/usr/share/doc/pcre/html/pcrepartial.html
@@ -106,7 +95,6 @@ INSTALLER_DIR/usr/lib/libpcreposix.so.0.0.0
 #INSTALLER_DIR/usr/share/man/man3/pcrebuild.3
 #INSTALLER_DIR/usr/share/man/man3/pcrecallout.3
 #INSTALLER_DIR/usr/share/man/man3/pcrecompat.3
-#INSTALLER_DIR/usr/share/man/man3/pcrecpp.3
 #INSTALLER_DIR/usr/share/man/man3/pcrematching.3
 #INSTALLER_DIR/usr/share/man/man3/pcrepartial.3
 #INSTALLER_DIR/usr/share/man/man3/pcrepattern.3