diff options
-rw-r--r-- | target/config/Config.in.libc | 5 | ||||
-rw-r--r-- | toolchain/newlib/Makefile.inc | 14 | ||||
-rw-r--r-- | toolchain/newlib/patches/2.2.0.20151023/disable-docs.patch (renamed from toolchain/newlib/patches/2.2.0/disable-docs.patch) | 0 | ||||
-rw-r--r-- | toolchain/newlib/patches/2.2.0.20151023/fix-tooldir.patch (renamed from toolchain/newlib/patches/2.2.0/fix-tooldir.patch) | 0 | ||||
-rw-r--r-- | toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch | 14 | ||||
-rw-r--r-- | toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch | 12 |
6 files changed, 41 insertions, 4 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 4c713223a..12b1f8f9f 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -163,6 +163,10 @@ config ADK_TARGET_LIB_MUSL_GIT bool "git" depends on ADK_TARGET_LIB_MUSL +config ADK_TARGET_LIB_NEWLIB_2_3_0 + bool "2.3.0" + depends on ADK_TARGET_LIB_NEWLIB + config ADK_TARGET_LIB_NEWLIB_2_2_0 bool "2.2.0" depends on ADK_TARGET_LIB_NEWLIB @@ -216,6 +220,7 @@ config ADK_LIBC_VERSION default "2.22" if ADK_TARGET_LIB_GLIBC_2_22 default "2.21" if ADK_TARGET_LIB_GLIBC_2_21 default "2.20-or1k" if ADK_TARGET_LIB_GLIBC_OR1K + default "2.3.0" if ADK_TARGET_LIB_NEWLIB_2_3_0 default "2.2.0" if ADK_TARGET_LIB_NEWLIB_2_2_0 default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \ ADK_TARGET_LIB_MUSL_GIT || \ diff --git a/toolchain/newlib/Makefile.inc b/toolchain/newlib/Makefile.inc index 3809ccc98..43eed2adc 100644 --- a/toolchain/newlib/Makefile.inc +++ b/toolchain/newlib/Makefile.inc @@ -8,11 +8,17 @@ PKG_RELEASE:= 1 PKG_SITES:= git://sourceware.org/git/newlib-cygwin.git DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif +ifeq ($(ADK_TARGET_LIB_NEWLIB_2_3_0),y) +PKG_VERSION:= 2.3.0.20160226 +PKG_RELEASE:= 1 +PKG_HASH:= a9489dd28276e4fb29d65a1388a359b1f005d2ba6a4b92a6e5a802b95e1ad7d1 +PKG_SITES:= ftp://sourceware.org/pub/newlib/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TARGET_LIB_NEWLIB_2_2_0),y) -PKG_VERSION:= 2.2.0 +PKG_VERSION:= 2.2.0.20151023 PKG_RELEASE:= 1 -PKG_HASH:= c1d53fd1765d955ac513aa6e2f576455ee7507072d400314495c8a8a26ebc8ec +PKG_HASH:= fd1d3d358dd66922f37563518e787196e1fba8adaa6d8b1e955d145b38b3fa60 PKG_SITES:= ftp://sourceware.org/pub/newlib/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-1.tar.gz -WRKDIST= $(WRKDIR)/${PKG_NAME}-${PKG_VERSION}-1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif diff --git a/toolchain/newlib/patches/2.2.0/disable-docs.patch b/toolchain/newlib/patches/2.2.0.20151023/disable-docs.patch index 3b500b61c..3b500b61c 100644 --- a/toolchain/newlib/patches/2.2.0/disable-docs.patch +++ b/toolchain/newlib/patches/2.2.0.20151023/disable-docs.patch diff --git a/toolchain/newlib/patches/2.2.0/fix-tooldir.patch b/toolchain/newlib/patches/2.2.0.20151023/fix-tooldir.patch index 652f7494b..652f7494b 100644 --- a/toolchain/newlib/patches/2.2.0/fix-tooldir.patch +++ b/toolchain/newlib/patches/2.2.0.20151023/fix-tooldir.patch diff --git a/toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch b/toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch new file mode 100644 index 000000000..3b500b61c --- /dev/null +++ b/toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch @@ -0,0 +1,14 @@ +diff -Nur newlib-2.2.0-1.orig/etc/Makefile.in newlib-2.2.0-1/etc/Makefile.in +--- newlib-2.2.0-1.orig/etc/Makefile.in 2010-11-20 20:37:57.000000000 +0100 ++++ newlib-2.2.0-1/etc/Makefile.in 2015-12-03 14:23:44.043820971 +0100 +@@ -63,8 +63,8 @@ + PDFFILES = standards.pdf configure.pdf + HTMLFILES = standards.html configure.html + +-all: info +-install install-strip: install-info ++all: ++install install-strip: + + uninstall: + diff --git a/toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch b/toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch new file mode 100644 index 000000000..652f7494b --- /dev/null +++ b/toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch @@ -0,0 +1,12 @@ +diff -Nur newlib-2.2.0-1.orig/configure newlib-2.2.0-1/configure +--- newlib-2.2.0-1.orig/configure 2014-07-05 23:09:07.000000000 +0200 ++++ newlib-2.2.0-1/configure 2015-11-25 06:33:11.461178398 +0100 +@@ -6985,7 +6985,7 @@ + + # Some systems (e.g., one of the i386-aix systems the gas testers are + # using) don't handle "\$" correctly, so don't use it here. +-tooldir='${exec_prefix}'/${target_noncanonical} ++tooldir='${exec_prefix}' + build_tooldir=${tooldir} + + # Create a .gdbinit file which runs the one in srcdir |