diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2018-08-26 19:00:00 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2018-08-26 19:00:00 +0200 |
| commit | 52ae98319bbc188a5efa330b2f665bc5e3d23b99 (patch) | |
| tree | 1861c14a935db6ff4d85c49f17dbd514a72b7db1 /tools/depends/target/pcre | |
| parent | 7f36e164a809597ca1bac4b82c7a0ff9e474b77e (diff) | |
[depends] bump pcre to 8.42
Diffstat (limited to 'tools/depends/target/pcre')
| -rw-r--r-- | tools/depends/target/pcre/Makefile | 5 | ||||
| -rw-r--r-- | tools/depends/target/pcre/ios-clear_cache.patch | 20 | ||||
| -rw-r--r-- | tools/depends/target/pcre/jit_aarch64.patch | 4 | ||||
| -rw-r--r-- | tools/depends/target/pcre/tvos-bitcode-fix.patch | 8 |
4 files changed, 29 insertions, 8 deletions
diff --git a/tools/depends/target/pcre/Makefile b/tools/depends/target/pcre/Makefile index c585b2d0d1..8cd5323746 100644 --- a/tools/depends/target/pcre/Makefile +++ b/tools/depends/target/pcre/Makefile @@ -1,9 +1,9 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile tvos-bitcode-fix.patch jit_aarch64.patch +DEPS= ../../Makefile.include Makefile tvos-bitcode-fix.patch jit_aarch64.patch ios-clear_cache.patch # lib name, version LIBNAME=pcre -VERSION=8.36 +VERSION=8.42 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz @@ -27,6 +27,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p1 -i ../tvos-bitcode-fix.patch cd $(PLATFORM); patch -p1 -i ../jit_aarch64.patch + cd $(PLATFORM); patch -p1 -i ../ios-clear_cache.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/target/pcre/ios-clear_cache.patch b/tools/depends/target/pcre/ios-clear_cache.patch new file mode 100644 index 0000000000..75d5683912 --- /dev/null +++ b/tools/depends/target/pcre/ios-clear_cache.patch @@ -0,0 +1,20 @@ +--- a/sljit/sljitConfigInternal.h ++++ b/sljit/sljitConfigInternal.h +@@ -275,12 +275,16 @@ + #define SLJIT_API_FUNC_ATTRIBUTE + #endif /* (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC) */ + ++#if defined(__APPLE__) ++#include <libkern/OSCacheControl.h> ++#endif ++ + /****************************/ + /* Instruction cache flush. */ + /****************************/ + + #if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) +-#if __has_builtin(__builtin___clear_cache) ++#if __has_builtin(__builtin___clear_cache) && !defined(__APPLE__) + + #define SLJIT_CACHE_FLUSH(from, to) \ + __builtin___clear_cache((char*)from, (char*)to) diff --git a/tools/depends/target/pcre/jit_aarch64.patch b/tools/depends/target/pcre/jit_aarch64.patch index 6cc7f42095..f69f4a6fd9 100644 --- a/tools/depends/target/pcre/jit_aarch64.patch +++ b/tools/depends/target/pcre/jit_aarch64.patch @@ -1,8 +1,8 @@ --- a/sljit/sljitConfigInternal.h +++ b/sljit/sljitConfigInternal.h -@@ -310,7 +310,7 @@ +@@ -316,7 +316,7 @@ #define SLJIT_CACHE_FLUSH(from, to) \ - sys_icache_invalidate((char*)(from), (char*)(to) - (char*)(from)) + __builtin___clear_cache((char*)from, (char*)to) -#elif defined __ANDROID__ +#elif (defined __ANDROID__ && !defined SLJIT_CONFIG_ARM_64) diff --git a/tools/depends/target/pcre/tvos-bitcode-fix.patch b/tools/depends/target/pcre/tvos-bitcode-fix.patch index 4be2878235..8b217fb45c 100644 --- a/tools/depends/target/pcre/tvos-bitcode-fix.patch +++ b/tools/depends/target/pcre/tvos-bitcode-fix.patch @@ -1,16 +1,16 @@ --- a/ltmain.sh +++ b/ltmain.sh -@@ -8715,16 +8715,6 @@ +@@ -10427,16 +10427,6 @@ case $host in *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). -- if test "$tagname" = CXX ; then +- if test CXX = "$tagname"; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- func_append compile_command " ${wl}-bind_at_load" -- func_append finalize_command " ${wl}-bind_at_load" +- func_append compile_command " $wl-bind_at_load" +- func_append finalize_command " $wl-bind_at_load" - ;; - esac - fi |