diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-10-08 23:23:12 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-10-08 23:23:12 +0200 |
| commit | 220c0918e4d86f81d60f9268532dcb7425362784 (patch) | |
| tree | 0bb88af5e070a2c160cb343623cb00538dc85751 /tools | |
| parent | 1f3dde29ca6d82f8b63e622a98f211ec0797938e (diff) | |
[depends] fix m4 crash for OSX 10.13
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/native/m4-native/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/native/m4-native/osx_snprintf.patch | 11 | ||||
| -rw-r--r-- | tools/depends/pre-depends/m4-pre-depends/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/pre-depends/m4-pre-depends/osx_snprintf.patch | 11 |
4 files changed, 26 insertions, 2 deletions
diff --git a/tools/depends/native/m4-native/Makefile b/tools/depends/native/m4-native/Makefile index 66bf69dd3a..d981db7caa 100644 --- a/tools/depends/native/m4-native/Makefile +++ b/tools/depends/native/m4-native/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) -DEPS= ../../Makefile.include.in Makefile +DEPS= ../../Makefile.include.in Makefile osx_snprintf.patch # lib name, version LIBNAME=m4 @@ -24,6 +24,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 -i ../osx_snprintf.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/native/m4-native/osx_snprintf.patch b/tools/depends/native/m4-native/osx_snprintf.patch new file mode 100644 index 0000000000..af1c470ca6 --- /dev/null +++ b/tools/depends/native/m4-native/osx_snprintf.patch @@ -0,0 +1,11 @@ +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -4858,7 +4858,7 @@ + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || (defined __APPLE__ && defined __MACH__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; diff --git a/tools/depends/pre-depends/m4-pre-depends/Makefile b/tools/depends/pre-depends/m4-pre-depends/Makefile index 3ce3f78a71..14a7dd8f77 100644 --- a/tools/depends/pre-depends/m4-pre-depends/Makefile +++ b/tools/depends/pre-depends/m4-pre-depends/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include.in -DEPS=Makefile +DEPS=Makefile osx_snprintf.patch PREFIX=$(CURDIR)/../../pre-build-deps PLATFORM=native TARBALLS_LOCATION=$(PREFIX) @@ -27,6 +27,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 -i ../osx_snprintf.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/pre-depends/m4-pre-depends/osx_snprintf.patch b/tools/depends/pre-depends/m4-pre-depends/osx_snprintf.patch new file mode 100644 index 0000000000..af1c470ca6 --- /dev/null +++ b/tools/depends/pre-depends/m4-pre-depends/osx_snprintf.patch @@ -0,0 +1,11 @@ +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -4858,7 +4858,7 @@ + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || (defined __APPLE__ && defined __MACH__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; |