From dc73d8723f49ef49898d779f9a14574dc25ad69d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 29 Dec 2018 15:25:37 +0100 Subject: [PATCH] cclive: unbreak on musl --- srcpkgs/cclive/patches/musl-strerror_r.patch | 12 ++++++++++++ srcpkgs/cclive/template | 4 ---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/cclive/patches/musl-strerror_r.patch diff --git a/srcpkgs/cclive/patches/musl-strerror_r.patch b/srcpkgs/cclive/patches/musl-strerror_r.patch new file mode 100644 index 0000000000..cec71dd684 --- /dev/null +++ b/srcpkgs/cclive/patches/musl-strerror_r.patch @@ -0,0 +1,12 @@ +--- src/cc/error.h 2018-12-29 15:15:13.042776367 +0100 ++++ - 2018-12-29 15:24:13.933668360 +0100 +@@ -40,7 +40,8 @@ + static inline std::string strerror(const int ec) + { + char buf[256]; +- return strerror_r(ec, buf, sizeof(buf)); ++ strerror_r(ec, buf, sizeof(buf)); ++ return buf; + } + + static inline std::string strerror() { return strerror(errno); } diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index 1048abebe4..4ec4c548b9 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -13,10 +13,6 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=2edeaf5d76455723577e0b593f0322a97f1e0c8b0cffcc70eca8b5d17374a495 CPPFLAGS="-P" -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="./cc/error.h:43:20: error: could not convert 'strerror_r(((int)ec), ((char*)(& buf)), sizeof (buf))' from 'int' to 'std::__cxx11::string' {aka 'std::__cxx11::basic_string'} " ;; -esac - post_install() { vlicense COPYING }