X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=libpcre%2FPkgfile;h=592642996c732ed09a22559a3e21b5488fc398f8;hb=57c4850f7b3a5ab69dd6d346986501004bb3721a;hp=7152907a868cffce20aee49292c7761a822c3351;hpb=83e7e2d09802b3a99d4eda97a03cad72a1b1039a;p=crossrootfs.git

diff --git a/libpcre/Pkgfile b/libpcre/Pkgfile
index 7152907..5926429 100644
--- a/libpcre/Pkgfile
+++ b/libpcre/Pkgfile
@@ -1,13 +1,17 @@
 # Description: Perl Compatible Regular Expressions
 # URL: http://www.pcre.org
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, devel@crux-arm.nu
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on:
 
 name=libpcre
-version=8.01
-release=1
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
+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)
+
 
 build() {
   cd pcre-$version
@@ -15,11 +19,30 @@ build() {
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
-              --mandir=/usr/man \
               --enable-utf8 \
-              --enable-unicode-properties
+              --enable-unicode-properties \
+              --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
   
-  rm -r $PKG/usr/share
+  install -d $PKG/lib
+  mv $PKG/usr/lib/libpcre.so.* $PKG/lib
+  ln -sf ../../lib/$(readlink $PKG/usr/lib/libpcre.so) $PKG/usr/lib/libpcre.so
+
+  rm -r $PKG/usr/share/doc
+  rm $PKG/usr/share/man/man3/{pcre{16,32}*,pcre_utf{16,32}*}
 }