diff options
| author | Ryan Mounce <ryan@mounce.com.au> | 2017-08-03 20:37:58 +0930 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-08-23 18:56:33 +0200 |
| commit | 25c045763a08a579feb6e42f9361edd1ca6333ae (patch) | |
| tree | 511935502e456f2323ebce201f39bac98cb7a6f6 /tools/patch/patches | |
| parent | 569f74ef49bae9326a723050a400346686983d86 (diff) | |
| download | upstream-25c045763a08a579feb6e42f9361edd1ca6333ae.tar.gz upstream-25c045763a08a579feb6e42f9361edd1ca6333ae.tar.bz2 upstream-25c045763a08a579feb6e42f9361edd1ca6333ae.zip | |
tools: patch various gnu tools for macOS 10.13
These host tools compile but may crash at runtime when building on
macOS 10.13 (High Sierra). Backport upstream gnulib patch until new
releases of affected tools.
https://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=c41f233c4c38e84023a16339782ee306f03e7f59
Signed-off-by: Ryan Mounce <ryan@mounce.com.au>
Diffstat (limited to 'tools/patch/patches')
| -rw-r--r-- | tools/patch/patches/001-fix-macos-vasnprintf.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tools/patch/patches/001-fix-macos-vasnprintf.patch b/tools/patch/patches/001-fix-macos-vasnprintf.patch new file mode 100644 index 0000000000..e41315d34e --- /dev/null +++ b/tools/patch/patches/001-fix-macos-vasnprintf.patch @@ -0,0 +1,25 @@ +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -4858,7 +4858,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + #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'; +@@ -4872,6 +4876,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + in format strings in writable memory may crash the program + (if compiled with _FORTIFY_SOURCE=2), so we should avoid it + in this situation. */ ++ /* macOS 10.13 High Sierra behaves like glibc with ++ _FORTIFY_SOURCE=2, and older macOS releases ++ presumably do not need %n. */ + /* On native Windows systems (such as mingw), we can avoid using + %n because: + - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, |