]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/pcre'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Apr 2014 12:53:30 +0000 (14:53 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Apr 2014 12:53:30 +0000 (14:53 +0200)
Conflicts:
pcre/pcre.nm

1  2 
pcre/pcre.nm

diff --combined pcre/pcre.nm
index 506d8275475dabb84e0f50487f336343f407cca1,782b4382424173d7060bfb12f7cc3165013dc03f..a9cc86c3806f90910bc4575c2fac42e09fd379fb
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = pcre
 -version    = 8.34
 -release    = 3
 +version    = 8.35
- release    = 1
++release    = 2
  
  compat_version = 8.21
  
@@@ -34,7 -34,7 +34,7 @@@ buil
        configure_options += \
                --disable-static \
                --docdir=/usr/share/doc/pcre-%{version} \
-               --enable-jit \
+               --disable-jit \
                --enable-pcre8 \
                --enable-pcre16 \
                --enable-pcre32 \