diff options
| -rw-r--r-- | config/libc/uClibc.in | 10 | ||||
| -rw-r--r-- | patches/zlib/1.2.11/110-no-_wopen-cygwin.patch | 30 |
2 files changed, 38 insertions, 2 deletions
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index e830662c..9d5e8fda 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -151,22 +151,28 @@ config LIBC_UCLIBC_VERBOSITY_0 config LIBC_UCLIBC_VERBOSITY_1 bool - prompt "Very verbose build" + prompt "Brief build (show defines, ld flags)" help Print simplified command lines. config LIBC_UCLIBC_VERBOSITY_2 bool - prompt "Brief build (show defines, ld flags)" + prompt "Very verbose build" help Print full command lines. endchoice +# uClibc-ng has reverted the meaning of V=1 and V=2 compared to its +# ancestor, uClibc, in order to match kernel's Kbuild settings. +# Hence, for uClibc-ng supply V=2 if "brief build" is selected, +# and so forth. config LIBC_UCLIBC_VERBOSITY string default "" if LIBC_UCLIBC_VERBOSITY_0 + default "V=2" if LIBC_UCLIBC_VERBOSITY_1 && LIBC_UCLIBC_NG default "V=1" if LIBC_UCLIBC_VERBOSITY_1 + default "V=1" if LIBC_UCLIBC_VERBOSITY_2 && LIBC_UCLIBC_NG default "V=2" if LIBC_UCLIBC_VERBOSITY_2 choice diff --git a/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch b/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch new file mode 100644 index 00000000..6704e3e1 --- /dev/null +++ b/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch @@ -0,0 +1,30 @@ +From a5e814c69315f3b7528418f6a5185c4f8a9dc250 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman <stilor@att.net> +Date: Wed, 15 Feb 2017 22:36:35 -0800 +Subject: [PATCH] Fix unresolved reference to _wopen on Cygwin + +The default Cygwin GCC/glibc do not provide _wopen. This seems to be +part of Win32API, which is provided by x86-w64-mingw32-gcc - but that +compiler does not define __CYGWIN__, it defines _WIN32. + +Signed-off-by: Alexey Neyman <stilor@att.net> +--- + gzguts.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gzguts.h b/gzguts.h +index 990a4d2..6378d46 100644 +--- a/gzguts.h ++++ b/gzguts.h +@@ -39,7 +39,7 @@ + # include <io.h> + #endif + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + # define WIDECHAR + #endif + +-- +2.9.3 + |