diff options
| author | Memphiz <memphis@machzwo.de> | 2015-12-21 10:23:07 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-01-06 15:52:19 +0100 |
| commit | a1d035c40d71bae2c938f4d88392b9ed7dc60d2e (patch) | |
| tree | e18d6ceae24494dd920e11b427b7603ce94b7ed5 /tools/depends/target/pcre | |
| parent | 83d0b637bac036c80fae562b218e6db5fa4ea006 (diff) | |
[depends/pcre] - version bump to 8.36 and fixed arm64/bitcode compilation
Diffstat (limited to 'tools/depends/target/pcre')
| -rw-r--r-- | tools/depends/target/pcre/Makefile | 5 | ||||
| -rw-r--r-- | tools/depends/target/pcre/tvos-bitcode-fix.patch | 19 |
2 files changed, 22 insertions, 2 deletions
diff --git a/tools/depends/target/pcre/Makefile b/tools/depends/target/pcre/Makefile index 141573493d..75848bb283 100644 --- a/tools/depends/target/pcre/Makefile +++ b/tools/depends/target/pcre/Makefile @@ -1,9 +1,9 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile +DEPS= ../../Makefile.include Makefile tvos-bitcode-fix.patch # lib name, version LIBNAME=pcre -VERSION=8.33 +VERSION=8.36 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz @@ -26,6 +26,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 < ../tvos-bitcode-fix.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/target/pcre/tvos-bitcode-fix.patch b/tools/depends/target/pcre/tvos-bitcode-fix.patch new file mode 100644 index 0000000000..7f04f5adc7 --- /dev/null +++ b/tools/depends/target/pcre/tvos-bitcode-fix.patch @@ -0,0 +1,19 @@ +--- a/ltmain.sh-org 2015-10-30 16:21:22.000000000 -0400 ++++ b/ltmain.sh 2015-10-30 16:22:21.000000000 -0400 +@@ -8715,16 +8715,6 @@ EOF + + 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 +- 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" +- ;; +- esac +- fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` |