X-Git-Url: http://gitweb/?a=blobdiff_plain;f=libpcre%2FPkgfile;h=95f159daf11991006d9bdf5cf27e842f1006149e;hb=fa6cd34777268040e8d88ae86dcdaa984a3a8710;hp=e9adc5ce295386ba0644d7f8b8b4da3861188f05;hpb=13bea70190a35217a25f42ade4d29272fbe74ffd;p=crossrootfs.git

diff --git a/libpcre/Pkgfile b/libpcre/Pkgfile
index e9adc5c..95f159d 100644
--- a/libpcre/Pkgfile
+++ b/libpcre/Pkgfile
@@ -5,12 +5,9 @@
 # Depends on:
 
 name=libpcre
-version=8.37
-release=5
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2
-        01-seven-security-patches.patch \
-        $name-$version-CVE-2015-5073.patch \
-        $name-$version-CVE-2015-XXXX.patch)
+version=8.40
+release=1
+source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
 
 
 build() {
@@ -21,7 +18,20 @@ build() {
               --prefix=/usr \
               --enable-utf8 \
               --enable-unicode-properties \
-              --enable-jit
+              --enable-jit \
+              --with-sysroot=$CLFS
+
+  # get rid of host lib search dirs from Makefiles
+  for mk in $(find -name Makefile) ; do
+    sed -i 's|-L/usr/lib||' $mk
+  done
+
+  # use same type fix as done for gcc port, to prevent libtool
+  # from linking in host libraries
+  for lt_file in $(find -name 'libtool') ; do
+    sed -i 's/func_append add_dir \" /add_dir=\"/' $lt_file
+  done
+
 
   make
   make DESTDIR=$PKG install