From f355cd3857e5d3e4a28ac7e0561431c5059183e4 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Jul 17 2010 07:50:18 +0000 Subject: - Workaround build failure on ppc/ppc64 --- diff --git a/a2jmidid-ppc.patch b/a2jmidid-ppc.patch new file mode 100644 index 0000000..1b8fc50 --- /dev/null +++ b/a2jmidid-ppc.patch @@ -0,0 +1,21 @@ +--- a2jmidid-6.old/sigsegv.c 2008-09-21 07:01:34.000000000 -0400 ++++ a2jmidid-6/sigsegv.c 2010-07-17 03:42:16.000000000 -0400 +@@ -49,6 +49,9 @@ char * __cxa_demangle(const char * __man + # define REGFORMAT "%x" + #endif + ++# if defined(powerpc) || defined(__ppc__) || defined(powerpc64) || defined(__ppc64__) || defined(__powerpc64__) //doesn't compile on ppc* ++static void signal_segv(int signum, siginfo_t* info, void*ptr) {} ++#else + static void signal_segv(int signum, siginfo_t* info, void*ptr) { + static const char *si_codes[3] = {"", "SEGV_MAPERR", "SEGV_ACCERR"}; + +@@ -146,7 +149,7 @@ static void signal_segv(int signum, sigi + a2j_error("End of stack trace"); + exit (-1); + } +- ++#endif //ppc,ppc64 + int setup_sigsegv() { + struct sigaction action; + diff --git a/a2jmidid.spec b/a2jmidid.spec index 95217c9..28ed69b 100644 --- a/a2jmidid.spec +++ b/a2jmidid.spec @@ -1,12 +1,16 @@ Summary: Daemon for exposing ALSA sequencer applications in JACK MIDI system Name: a2jmidid Version: 6 -Release: 3%{?dist} +Release: 3%{?dist}.1 URL: http://home.gna.org/a2jmidid/ Source0: http://download.gna.org/%{name}/%{name}-%{version}.tar.bz2 # Fix DSO linking error # https://gna.org/support/index.php?2547 Patch0: a2jmidid-linking.patch +# Sigsegv stacktrace doesn't compile on ppc. Workaround. +# Actually the code is taken from jack2. This workaround is +# also taken from jack2. +Patch1: a2jmidid-ppc.patch # a2jmidi_bridge.c and j2amidi_bridge.c are GPLv2+ # The rest is GPLv2 License: GPLv2 and GPLv2+ @@ -35,6 +39,7 @@ one ALSA sequencer port and one JACK MIDI port. Such bridge is unidirectional. %prep %setup -q %patch0 -p1 -b .linking +%patch1 -p1 -b .ppc %build export CFLAGS="%{optflags}" @@ -60,6 +65,9 @@ rm -fr %{buildroot} %{_datadir}/dbus-1/services/org.gna.home.a2jmidid.service %changelog +* Sat Jul 17 2010 Orcan Ogetbil - 6-3.1 +- Workaround build failure on ppc/ppc64 + * Fri Jul 16 2010 Orcan Ogetbil - 6-3 - Fix license tag