Orcan Ogetbil
10 years ago
parent
51ba5e4593
commit
6202400b47
@ -1,30 +0,0 @@
|
|||||||
From d11bb095291d8880508c87adfe625bf2bcab1456 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Graf <agraf@suse.de>
|
|
||||||
Date: Tue, 5 Mar 2013 01:38:10 +0100
|
|
||||||
Subject: [PATCH] Add support for aarch64
|
|
||||||
|
|
||||||
When compiling jack on aarch64, compilation fails because NGREGS is not
|
|
||||||
defined. Since this is only for debug output on segmentation faults, stub
|
|
||||||
the debug print out like it's been done for other platforms before.
|
|
||||||
|
|
||||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
||||||
---
|
|
||||||
dbus/sigsegv.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c
|
|
||||||
index d41091c..64c3986 100644
|
|
||||||
--- a/dbus/sigsegv.c
|
|
||||||
+++ b/dbus/sigsegv.c
|
|
||||||
@@ -104,7 +104,7 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
|
|
||||||
jack_error("info.si_errno = %d", info->si_errno);
|
|
||||||
jack_error("info.si_code = %d (%s)", info->si_code, si_code_str);
|
|
||||||
jack_error("info.si_addr = %p", info->si_addr);
|
|
||||||
-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
|
|
||||||
+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__)
|
|
||||||
for(i = 0; i < NGREG; i++)
|
|
||||||
jack_error("reg[%02d] = 0x" REGFORMAT, i,
|
|
||||||
#if defined(__powerpc64__)
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
diff -rupN jack-1.9.9.5.old/wscript jack-1.9.9.5/wscript
|
|
||||||
--- jack-1.9.9.5.old/wscript 2012-12-10 04:26:57.000000000 -0500
|
|
||||||
+++ jack-1.9.9.5/wscript 2012-12-16 23:29:44.629292671 -0500
|
|
||||||
@@ -356,10 +356,11 @@ def build(bld):
|
|
||||||
bld.add_subdirs('dbus')
|
|
||||||
|
|
||||||
if bld.env['BUILD_DOXYGEN_DOCS'] == True:
|
|
||||||
- share_dir = bld.env.get_destdir() + bld.env['PREFIX'] + '/share/jack-audio-connection-kit'
|
|
||||||
html_docs_source_dir = "build/default/html"
|
|
||||||
- html_docs_install_dir = share_dir + '/reference/html/'
|
|
||||||
- if Options.commands['install']:
|
|
||||||
+ if bld.cmd == 'install':
|
|
||||||
+ share_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/jack-audio-connection-kit'
|
|
||||||
+ html_docs_install_dir = share_dir + '/reference/html/'
|
|
||||||
+
|
|
||||||
if os.path.isdir(html_docs_install_dir):
|
|
||||||
Logs.pprint('CYAN', "Removing old doxygen documentation installation...")
|
|
||||||
shutil.rmtree(html_docs_install_dir)
|
|
||||||
@@ -367,17 +368,17 @@ def build(bld):
|
|
||||||
Logs.pprint('CYAN', "Installing doxygen documentation...")
|
|
||||||
shutil.copytree(html_docs_source_dir, html_docs_install_dir)
|
|
||||||
Logs.pprint('CYAN', "Installing doxygen documentation done.")
|
|
||||||
- elif Options.commands['uninstall']:
|
|
||||||
+ elif bld.cmd =='uninstall':
|
|
||||||
Logs.pprint('CYAN', "Uninstalling doxygen documentation...")
|
|
||||||
if os.path.isdir(share_dir):
|
|
||||||
shutil.rmtree(share_dir)
|
|
||||||
Logs.pprint('CYAN', "Uninstalling doxygen documentation done.")
|
|
||||||
- elif Options.commands['clean']:
|
|
||||||
+ elif bld.cmd =='clean':
|
|
||||||
if os.access(html_docs_source_dir, os.R_OK):
|
|
||||||
Logs.pprint('CYAN', "Removing doxygen generated documentation...")
|
|
||||||
shutil.rmtree(html_docs_source_dir)
|
|
||||||
Logs.pprint('CYAN', "Removing doxygen generated documentation done.")
|
|
||||||
- elif Options.commands['build']:
|
|
||||||
+ elif bld.cmd =='build':
|
|
||||||
if not os.access(html_docs_source_dir, os.R_OK):
|
|
||||||
os.popen("doxygen").read()
|
|
||||||
else:
|
|
||||||
Loading…
Reference in new issue