gnustep-base: unbreak musl

This commit is contained in:
Duncaen 2019-04-27 01:36:04 +02:00
parent 8a5257d943
commit 54e6bca33a
2 changed files with 26 additions and 3 deletions

View file

@ -0,0 +1,24 @@
--- Source/GSFormat.m.orig
+++ Source/GSFormat.m
@@ -884,10 +884,10 @@
/* Initialize local variables. */
done = 0;
grouping = (const char *) -1;
-#ifdef __va_copy
+#ifdef va_copy
/* This macro will be available soon in gcc's <stdarg.h>. We need it
since on some systems `va_list' is not an integral type. */
- __va_copy (ap_save, ap);
+ va_copy (ap_save, ap);
#else
ap_save = ap;
#endif
@@ -1947,7 +1947,7 @@
all_done:
if (workend_malloced) free(workend);
/* Unlock the stream. */
-#ifdef __va_copy
+#ifdef va_copy
va_end(ap_save);
#endif
return;

View file

@ -1,7 +1,7 @@
# Template file for 'gnustep-base'
pkgname=gnustep-base
version=1.26.0
revision=4
revision=5
build_style=gnu-configure
hostmakedepends="gnustep-make gcc-objc pkg-config"
makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
@ -15,8 +15,7 @@ checksum=f68bc066c60c73cfc1582326866d0a59be791df56d752dfdc51b838e79364173
nocross="objc doesn't get cross build at present within gcc"
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args="${configure_args} --disable-iconv";
broken="musl patching for this is beyond the author at this time";;
*-musl) configure_args="${configure_args} --disable-iconv"; ;;
*) ;;
esac