diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-28 03:10:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-28 03:10:20 +0100 |
| commit | 2d195e88f2d1be1363e878323af0ff0a4a5db3e6 (patch) | |
| tree | 2081b28df05db4c3bab1b41f77c39df7b1e04b8a | |
| parent | 9f7daa8c21b22cfec7dd32087122310256a3f42c (diff) | |
uclibc-ng: fix iconv handling
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/patches/1.0.21/iconv.patch | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 1d27622d3..f21e8802f 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -94,7 +94,7 @@ ifeq ($(ADK_TARGET_BINFMT_FLAT_SHARED),y) endif endif ifeq ($(ADK_TARGET_LIBC_ICONV),y) - $(SED) 's/.*\(UCLIBC_HAS_LOCALE\).*/\1=y/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_LIBICONV\).*/\1=y/' ${WRKBUILD}/.config endif ifeq ($(ADK_RUNTIME_ENABLE_LOCALE),y) $(SED) 's/.*\(UCLIBC_HAS_LOCALE\).*/\1=y/' ${WRKBUILD}/.config diff --git a/toolchain/uclibc-ng/patches/1.0.21/iconv.patch b/toolchain/uclibc-ng/patches/1.0.21/iconv.patch new file mode 100644 index 000000000..0069eb042 --- /dev/null +++ b/toolchain/uclibc-ng/patches/1.0.21/iconv.patch @@ -0,0 +1,12 @@ +diff -Nur uClibc-ng-1.0.21.orig/Makefile.in uClibc-ng-1.0.21/Makefile.in +--- uClibc-ng-1.0.21.orig/Makefile.in 2016-12-26 09:12:14.000000000 +0100 ++++ uClibc-ng-1.0.21/Makefile.in 2016-12-27 18:33:22.312597987 +0100 +@@ -282,7 +282,7 @@ + HEADERS_RM-$(UCLIBC_HAS_BACKTRACE) += execinfo.h + HEADERS_RM-$(UCLIBC_HAS_LIBICONV) += iconv.h + HEADERS_RM-$(UCLIBC_HAS_LIBINTL) += intl.h +-HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h ++HEADERS_RM-$(UCLIBC_HAS_LOCALE) += bits/uClibc_ctype.h + HEADERS_RM-$(UCLIBC_HAS_PTY) += pty.h + HEADERS_RM-$(UCLIBC_HAS_REALTIME) += mqueue.h bits/mqueue.h sched.h \ + bits/sched.h \ |