From 24e920f8350a7cbdff92ed5e639fecf5af967da9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 18 May 2015 10:05:10 +0200 Subject: [PATCH] musl: remove libintl.h and rely on gettext for internalization. musl's dcngettext() seems to have issues or incompatible with the detection tests in GNU configure scripts, resulting in segfaults on any software that uses dcngettext() and friends. For now do what Alpine does and use gettext. --- srcpkgs/musl/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 21d189515a..05680900e7 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,7 +1,7 @@ # Template file for 'musl'. pkgname=musl version=1.1.9 -revision=1 +revision=2 build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" conflicts="glibc>=0" @@ -15,7 +15,7 @@ checksum=00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e nostrip_files="libc.so" shlib_provides="libc.so" only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl aarch64-musl" -CFLAGS="-fno-stack-protector -U_FORTIFY_SOURCE" +CFLAGS="-U_FORTIFY_SOURCE" post_build() { $CC $CFLAGS $LDFLAGS ${FILESDIR}/getent.c -o getent @@ -41,4 +41,7 @@ do_install() { vmkdir usr/share/xbps.d echo "architecture=${XBPS_TARGET_MACHINE}" > ${DESTDIR}/usr/share/xbps.d/musl-arch.conf + # Use gettext libintl.h implementation, there seems to be + # issues with musl's dcngettext(). + rm -f ${DESTDIR}/usr/include/libintl.h }