From 629ba45a9be38e7682bfa28a845c4c3e9d75a1cb Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 10 Dec 2012 14:24:21 +0000 Subject: [PATCH] toolchain/musl: update to 0.9.8 Signed-off-by: Florian Fainelli SVN-Revision: 34597 --- toolchain/musl/Config.in | 6 +- toolchain/musl/Config.version | 6 +- toolchain/musl/common.mk | 2 +- .../003-fix_termios_constants_on_mips.patch | 99 ------------------- .../001-bsd_ether_h.patch | 0 .../002-no_mips_fpu.patch | 0 6 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch rename toolchain/musl/{patches-0.9.7 => patches-0.9.8}/001-bsd_ether_h.patch (100%) rename toolchain/musl/{patches-0.9.7 => patches-0.9.8}/002-no_mips_fpu.patch (100%) diff --git a/toolchain/musl/Config.in b/toolchain/musl/Config.in index 254a8d4201..b34f724e69 100644 --- a/toolchain/musl/Config.in +++ b/toolchain/musl/Config.in @@ -3,12 +3,12 @@ choice prompt "musl Version" depends on TOOLCHAINOPTS && USE_MUSL - default MUSL_VERSION_0_9_7 + default MUSL_VERSION_0_9_8 help Select the version of musl you wish to use. - config MUSL_VERSION_0_9_7 - bool "musl 0.9.7" + config MUSL_VERSION_0_9_8 + bool "musl 0.9.8" endchoice diff --git a/toolchain/musl/Config.version b/toolchain/musl/Config.version index e76033be22..a1b303f9ea 100644 --- a/toolchain/musl/Config.version +++ b/toolchain/musl/Config.version @@ -1,12 +1,12 @@ config MUSL_VERSION string depends on USE_MUSL - default "0.9.7" if MUSL_VERSION_0_9_7 - default "0.9.7" + default "0.9.8" if MUSL_VERSION_0_9_8 + default "0.9.8" if !TOOLCHAINOPTS - config MUSL_VERSION_0_9_7 + config MUSL_VERSION_0_9_8 default y if USE_MUSL bool diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk index 68cb2396fa..a83d25459d 100644 --- a/toolchain/musl/common.mk +++ b/toolchain/musl/common.mk @@ -14,7 +14,7 @@ PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.musl-libc.org/musl PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=2df4f6f17b1f14684cb991c53c9ef0ddaa8c7bad +PKG_SOURCE_VERSION:=e6dcebd5efa2d390f0a24dc11444024e9fd1990c PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz LIBC_SO_VERSION:=$(PKG_VERSION) PATCH_DIR:=$(PATH_PREFIX)/patches-$(PKG_VERSION) diff --git a/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch b/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch deleted file mode 100644 index 73e22a590c..0000000000 --- a/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 144dc4f479d49b8148f8b1b6b506b0f1096f911b Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Fri, 23 Nov 2012 17:23:38 -0500 -Subject: [PATCH] fix termios constants on mips - ---- - arch/mips/bits/termios.h | 31 +++++++++++++++++++++---------- - 1 file changed, 21 insertions(+), 10 deletions(-) - -diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h -index 9f6abd8..179af8e 100644 ---- a/arch/mips/bits/termios.h -+++ b/arch/mips/bits/termios.h -@@ -14,19 +14,20 @@ struct termios - #define VQUIT 1 - #define VERASE 2 - #define VKILL 3 --#define VEOF 4 -+#define VMIN 4 - #define VTIME 5 --#define VMIN 6 -+#define VEOL2 6 - #define VSWTC 7 -+#define VSWTCH 7 - #define VSTART 8 - #define VSTOP 9 - #define VSUSP 10 --#define VEOL 11 - #define VREPRINT 12 - #define VDISCARD 13 - #define VWERASE 14 - #define VLNEXT 15 --#define VEOL2 16 -+#define VEOF 16 -+#define VEOL 17 - - #define IGNBRK 0000001 - #define BRKINT 0000002 -@@ -42,6 +43,7 @@ struct termios - #define IXANY 0004000 - #define IXOFF 0010000 - #define IMAXBEL 0020000 -+#define IUTF8 0040000 - - #define OPOST 0000001 - #define OLCUC 0000002 -@@ -94,7 +96,10 @@ struct termios - #define B9600 0000015 - #define B19200 0000016 - #define B38400 0000017 -+#define EXTA 0000016 -+#define EXTB 0000017 - -+#define BOTHER 0010000 - #define B57600 0010001 - #define B115200 0010002 - #define B230400 0010003 -@@ -124,26 +129,32 @@ struct termios - #define PARODD 0001000 - #define HUPCL 0002000 - #define CLOCAL 0004000 -+#define CBAUDEX 0010000 - -+#define CIBAUD 002003600000 -+#define CMSPAR 010000000000 - #define CRTSCTS 020000000000 -+#define IBSHIFT 16 - - #define ISIG 0000001 - #define ICANON 0000002 -+#define XCASE 0000004 - #define ECHO 0000010 - #define ECHOE 0000020 - #define ECHOK 0000040 - #define ECHONL 0000100 - #define NOFLSH 0000200 --#define TOSTOP 0000400 --#define IEXTEN 0100000 -- --/* Extensions? */ --#define CBAUDEX 0010000 -+#define IEXTEN 0000400 - #define ECHOCTL 0001000 - #define ECHOPRT 0002000 - #define ECHOKE 0004000 --#define FLUSHO 0010000 -+#define FLUSHO 0020000 - #define PENDIN 0040000 -+#define TOSTOP 0100000 -+#define ITOSTOP 0100000 -+#define EXTPROC 0200000 -+ -+#define TIOCSER_TEMT 1 - - #define TCOOFF 0 - #define TCOON 1 --- -1.7.10.4 - diff --git a/toolchain/musl/patches-0.9.7/001-bsd_ether_h.patch b/toolchain/musl/patches-0.9.8/001-bsd_ether_h.patch similarity index 100% rename from toolchain/musl/patches-0.9.7/001-bsd_ether_h.patch rename to toolchain/musl/patches-0.9.8/001-bsd_ether_h.patch diff --git a/toolchain/musl/patches-0.9.7/002-no_mips_fpu.patch b/toolchain/musl/patches-0.9.8/002-no_mips_fpu.patch similarity index 100% rename from toolchain/musl/patches-0.9.7/002-no_mips_fpu.patch rename to toolchain/musl/patches-0.9.8/002-no_mips_fpu.patch -- 2.30.2