From 54e6bca33a2f47d35e0b8d4be34cea961f8f3a1d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 27 Apr 2019 01:36:04 +0200 Subject: [PATCH] gnustep-base: unbreak musl --- .../gnustep-base/patches/use-va_copy.patch | 24 +++++++++++++++++++ srcpkgs/gnustep-base/template | 5 ++-- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnustep-base/patches/use-va_copy.patch diff --git a/srcpkgs/gnustep-base/patches/use-va_copy.patch b/srcpkgs/gnustep-base/patches/use-va_copy.patch new file mode 100644 index 00000000000..2d5ea727cc3 --- /dev/null +++ b/srcpkgs/gnustep-base/patches/use-va_copy.patch @@ -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 . 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; diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template index 0d77747172e..0a2c4f630e3 100644 --- a/srcpkgs/gnustep-base/template +++ b/srcpkgs/gnustep-base/template @@ -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