From edb9d24f2fb2b50aac7660b4e55437503ffff73c Mon Sep 17 00:00:00 2001 From: jbu Date: Mon, 1 Jun 2015 10:48:22 +0200 Subject: [PATCH] widelands: unbreak musl build --- srcpkgs/widelands/patches/fix-execinfo.patch | 30 +++++++++++++++++++ .../patches/fix_nl_msg_cat_cntr.patch | 18 +++++++++++ srcpkgs/widelands/template | 2 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/widelands/patches/fix-execinfo.patch create mode 100644 srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch diff --git a/srcpkgs/widelands/patches/fix-execinfo.patch b/srcpkgs/widelands/patches/fix-execinfo.patch new file mode 100644 index 0000000000..1ce0d7765a --- /dev/null +++ b/srcpkgs/widelands/patches/fix-execinfo.patch @@ -0,0 +1,30 @@ +Disable execinfo.h and backtrace() for musl + +--- src/backtrace.cc 2015-06-01 10:36:22.655599851 +0200 ++++ src/backtrace.cc 2015-06-01 10:35:04.179600083 +0200 +@@ -22,15 +22,17 @@ + #ifndef _WIN32 + #ifndef __APPLE__ + #include +- ++#ifdef __GLIBC__ + #include + #endif + #endif ++#endif + + std::string get_backtrace() { + std::string result("Backtrace:\n"); + #ifndef _WIN32 + #ifndef __APPLE__ ++#ifdef __GLIBC__ + #define BACKTRACE_STACKSIZE 24 + + void * stack[BACKTRACE_STACKSIZE]; +@@ -43,5 +45,6 @@ + free(list); + #endif + #endif ++#endif + return result; + } diff --git a/srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch b/srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch new file mode 100644 index 0000000000..7707f776a6 --- /dev/null +++ b/srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch @@ -0,0 +1,18 @@ +--- src/i18n.cc 2014-02-22 10:06:51.000000000 +0100 ++++ src/i18n.cc 2015-06-01 10:44:01.035598493 +0200 +@@ -192,6 +192,7 @@ + #endif + + #ifdef __linux__ ++#ifdef __GLIBC__ + char * res = nullptr; + char const * encoding[] = {"", ".utf-8", "@euro", ".UTF-8"}; + std::size_t found = alt_str.find(',', 0); +@@ -236,6 +237,7 @@ + /* Finally make changes known. */ + ++_nl_msg_cat_cntr; + #endif ++#endif + + SETLOCALE(LC_ALL, ""); // call to libintl + diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template index 786aa23401..21997a5fed 100644 --- a/srcpkgs/widelands/template +++ b/srcpkgs/widelands/template @@ -1,7 +1,7 @@ # Template file for 'widelands' pkgname=widelands version=18 -revision=2 +revision=3 wrksrc=${pkgname}-build${version}-src build_style=cmake configure_args="