diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template index 62e9f3c10b..a00dc0e036 100644 --- a/srcpkgs/musl-bootstrap/template +++ b/srcpkgs/musl-bootstrap/template @@ -1,6 +1,6 @@ # Template file for 'musl-bootstrap'. pkgname=musl-bootstrap -version=1.1.11 +version=1.1.12 revision=1 lib32disabled=yes wrksrc="musl-${version}" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" -checksum=bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f +checksum=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e post_install() { mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib/ diff --git a/srcpkgs/musl/patches/no-utf8-code-units-locale.patch b/srcpkgs/musl/patches/no-utf8-code-units-locale.patch deleted file mode 100644 index 0e5f3727c4..0000000000 --- a/srcpkgs/musl/patches/no-utf8-code-units-locale.patch +++ /dev/null @@ -1,15 +0,0 @@ -Temporary fix for https://github.com/voidlinux/void-packages/issues/2425 - -@dalias affirmed that returning UTF-8 even when requesting C locale is just fine. - ---- src/locale/langinfo.c.orig 2015-09-01 08:41:59.830797631 +0200 -+++ src/locale/langinfo.c 2015-09-01 08:42:15.324966247 +0200 -@@ -34,7 +34,7 @@ char *__nl_langinfo_l(nl_item item, loca - const char *str; - - if (item == CODESET) -- return MB_CUR_MAX==1 ? "UTF-8-CODE-UNITS" : "UTF-8"; -+ return "UTF-8"; - - switch (cat) { - case LC_NUMERIC: diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 5d9f89031f..870472aec5 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,7 +1,7 @@ # Template file for 'musl'. pkgname=musl -version=1.1.11 -revision=2 +version=1.1.12 +revision=1 build_pie=yes build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" -checksum=bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f +checksum=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e nostrip_files="libc.so" shlib_provides="libc.so"