diff options
| author | Vlad Glagolev | 2015-03-06 11:43:00 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-03-06 11:43:00 +0300 |
| commit | 6f04b8bea8a3299b24e3b70caeb0ed4ac74a15a0 (patch) | |
| tree | acdc48d85efd96b97a50d986b7803180fed82110 | |
| parent | 6bfb5192c631a54e6ac1aff0d82481847e91e07c (diff) | |
pcre: re-enabled build of static libraries
| -rwxr-xr-x | libs/pcre/BUILD | 3 | ||||
| -rw-r--r-- | libs/pcre/HISTORY | 4 | ||||
| -rwxr-xr-x | libs/pcre/PRE_BUILD | 2 | ||||
| -rw-r--r-- | libs/pcre/cve-2014-8964.patch (renamed from libs/pcre/cve-2014-8964) | 0 |
4 files changed, 7 insertions, 2 deletions
diff --git a/libs/pcre/BUILD b/libs/pcre/BUILD index 5f9466f081..f124548cc8 100755 --- a/libs/pcre/BUILD +++ b/libs/pcre/BUILD @@ -1,4 +1,5 @@ -OPTS+=" --disable-static $JIT $PCRE8 $PCRE16" && +OPTS="$JIT $PCRE8 $PCRE16 $OPTS" && + if [[ $BUILDUTF == y ]]; then OPTS="$OPTS --enable-utf" if [[ $UTFPROPERTIES == y ]]; then diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY index a90e71b679..9ab5a89f22 100644 --- a/libs/pcre/HISTORY +++ b/libs/pcre/HISTORY @@ -1,3 +1,7 @@ +2015-03-06 Vlad Glagolev <stealth@sourcemage.org> + * BUILD: re-enabled build of static libraries + * cve-2014-8964: renamed to cve-2014-8964.patch + 2014-11-22 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 8.36 SECURITY_PATCH++, upstream patch diff --git a/libs/pcre/PRE_BUILD b/libs/pcre/PRE_BUILD index fe4a475213..dccf52ebb9 100755 --- a/libs/pcre/PRE_BUILD +++ b/libs/pcre/PRE_BUILD @@ -1,3 +1,3 @@ default_pre_build && cd $SOURCE_DIRECTORY && -patch -p0 < $SPELL_DIRECTORY/cve-2014-8964 +patch -p0 < $SPELL_DIRECTORY/cve-2014-8964.patch diff --git a/libs/pcre/cve-2014-8964 b/libs/pcre/cve-2014-8964.patch index e15e0b0a19..e15e0b0a19 100644 --- a/libs/pcre/cve-2014-8964 +++ b/libs/pcre/cve-2014-8964.patch |