From 9be7403e325ecbeb68c9674362688c8c3bfcb91e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 4 Sep 2013 17:29:37 +0200 Subject: update musl libc --- toolchain/musl/Makefile | 7 ++++--- toolchain/musl/Makefile.inc | 4 ++-- toolchain/musl/patches/0.9.12/libgcc.patch | 12 ------------ toolchain/musl/patches/0.9.13/libgcc.patch | 12 ++++++++++++ 4 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 toolchain/musl/patches/0.9.12/libgcc.patch create mode 100644 toolchain/musl/patches/0.9.13/libgcc.patch (limited to 'toolchain/musl') diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index d2c07d194..91a6add88 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -7,9 +7,10 @@ include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk $(WRKBUILD)/.headers: - (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' ./configure --prefix=/usr \ - --target=$(REAL_GNU_TARGET_NAME) \ - --disable-gcc-wrapper \ + (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ + ./configure --prefix=/usr \ + --target=$(REAL_GNU_TARGET_NAME) \ + --disable-gcc-wrapper \ ) $(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install-headers touch $(WRKBUILD)/.configured diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 068c07ef8..83dc75168 100644 --- a/toolchain/musl/Makefile.inc +++ b/toolchain/musl/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= musl -PKG_VERSION:= 0.9.12 +PKG_VERSION:= 0.9.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= 100c8e932d0785c35b92539f025aa76f +PKG_MD5SUM:= 6af97d6157a2f4ee7a17af2316389fd7 PKG_SITES:= http://www.musl-libc.org/releases/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/toolchain/musl/patches/0.9.12/libgcc.patch b/toolchain/musl/patches/0.9.12/libgcc.patch deleted file mode 100644 index d382ef1fa..000000000 --- a/toolchain/musl/patches/0.9.12/libgcc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur musl-0.9.12.orig/Makefile musl-0.9.12/Makefile ---- musl-0.9.12.orig/Makefile 2013-07-29 09:20:33.000000000 +0200 -+++ musl-0.9.12/Makefile 2013-08-17 16:10:10.000000000 +0200 -@@ -100,7 +100,7 @@ - $(CC) $(CFLAGS_ALL_SHARED) -c -o $@ $< - - lib/libc.so: $(LOBJS) -- $(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -nostdlib -shared \ -+ $(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -static-libgcc -nostdlib -shared \ - -Wl,-e,_start -Wl,-Bsymbolic-functions \ - -o $@ $(LOBJS) $(LIBCC) - diff --git a/toolchain/musl/patches/0.9.13/libgcc.patch b/toolchain/musl/patches/0.9.13/libgcc.patch new file mode 100644 index 000000000..d382ef1fa --- /dev/null +++ b/toolchain/musl/patches/0.9.13/libgcc.patch @@ -0,0 +1,12 @@ +diff -Nur musl-0.9.12.orig/Makefile musl-0.9.12/Makefile +--- musl-0.9.12.orig/Makefile 2013-07-29 09:20:33.000000000 +0200 ++++ musl-0.9.12/Makefile 2013-08-17 16:10:10.000000000 +0200 +@@ -100,7 +100,7 @@ + $(CC) $(CFLAGS_ALL_SHARED) -c -o $@ $< + + lib/libc.so: $(LOBJS) +- $(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -nostdlib -shared \ ++ $(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -static-libgcc -nostdlib -shared \ + -Wl,-e,_start -Wl,-Bsymbolic-functions \ + -o $@ $(LOBJS) $(LIBCC) + -- cgit v1.2.3