From 32790404b3598e9e6b03717f20a3b74c3991cdc5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 6 Jun 2016 16:01:10 +0200 Subject: [PATCH] a2jmidid: fix musl build, nopie=yes --- .../a2jmidid/patches/musl-no-execinfo.patch | 29 +++++++++++++++++++ srcpkgs/a2jmidid/template | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/a2jmidid/patches/musl-no-execinfo.patch diff --git a/srcpkgs/a2jmidid/patches/musl-no-execinfo.patch b/srcpkgs/a2jmidid/patches/musl-no-execinfo.patch new file mode 100644 index 00000000000..3cdbbc1be97 --- /dev/null +++ b/srcpkgs/a2jmidid/patches/musl-no-execinfo.patch @@ -0,0 +1,29 @@ +--- sigsegv.c.orig 2016-06-06 15:56:47.355074711 +0200 ++++ sigsegv.c 2016-06-06 15:55:40.740071274 +0200 +@@ -28,7 +28,9 @@ + #include + #include + #include ++#if defined(__GLIBC__) + #include ++#endif + #include + #ifndef NO_CPP_DEMANGLE + //#include +@@ -145,13 +147,15 @@ + ip = bp[1]; + bp = (void**)bp[0]; + } +-#else ++#elif defined(__GLIBC__) + a2j_error("Stack trace (non-dedicated):"); + sz = backtrace(bt, 20); + strings = backtrace_symbols(bt, sz); + + for(i = 0; i < sz; ++i) + a2j_error("%s", strings[i]); ++#else ++ a2j_error("Stack trace unavailable"); + #endif + a2j_error("End of stack trace"); + exit (-1); diff --git a/srcpkgs/a2jmidid/template b/srcpkgs/a2jmidid/template index d668b3735d1..758d0bd97c9 100644 --- a/srcpkgs/a2jmidid/template +++ b/srcpkgs/a2jmidid/template @@ -1,7 +1,7 @@ # Template file for 'a2jmidid' pkgname=a2jmidid version=8 -revision=4 +revision=5 build_style=waf hostmakedepends="python pkg-config" makedepends="alsa-lib-devel jack-devel dbus-devel" @@ -11,6 +11,7 @@ homepage="http://home.gna.org/a2jmidid/" license="GPL-2" distfiles="http://download.gna.org/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f +nopie=yes do_configure() { python waf configure --prefix=/usr