Преглед на файлове

uclibc-ng: fix iconv handling

Waldemar Brodkorb преди 7 години
родител
ревизия
2d195e88f2
променени са 2 файла, в които са добавени 13 реда и са изтрити 1 реда
  1. 1 1
      toolchain/uclibc-ng/Makefile
  2. 12 0
      toolchain/uclibc-ng/patches/1.0.21/iconv.patch

+ 1 - 1
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

+ 12 - 0
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 \