From 8455ed10f04eceec29f94471c3f83c92f25bbf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 18 Jul 2020 11:15:26 +0700 Subject: [PATCH] gmime: correct ISO-10646 prefered name in musl --- srcpkgs/gmime/files/musl-iconv-detect.h | 5 +++++ srcpkgs/gmime/template | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gmime/files/musl-iconv-detect.h diff --git a/srcpkgs/gmime/files/musl-iconv-detect.h b/srcpkgs/gmime/files/musl-iconv-detect.h new file mode 100644 index 0000000000..9f431bf9ff --- /dev/null +++ b/srcpkgs/gmime/files/musl-iconv-detect.h @@ -0,0 +1,5 @@ +/* This is an auto-generated header, DO NOT EDIT! */ + +#define ICONV_ISO_INT_FORMAT "iso-%u-%u" +#define ICONV_ISO_STR_FORMAT "iso-%u-%s" +#define ICONV_10646 "UCS-4BE" diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template index 92f73d150b..697cbd0ab6 100644 --- a/srcpkgs/gmime/template +++ b/srcpkgs/gmime/template @@ -1,7 +1,7 @@ # Template file for 'gmime' pkgname=gmime version=2.6.23 -revision=3 +revision=4 build_style=gnu-configure build_helper="gir" configure_args="--disable-static --disable-mono --enable-smime @@ -27,8 +27,12 @@ if [ "$CROSS_BUILD" ]; then fi pre_build() { - if [ "$CROSS_BUILD" ]; then - cp ${FILESDIR}/*.h ${wrksrc} + if [ -z "$CROSS_BUILD" ]; then + : + elif [ "$XBPS_TARGET_LIBC" = musl ]; then + cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h + else + cp ${FILESDIR}/iconv-detect.h ${wrksrc} fi }