ardour/livetrax
13
0
Fork 0
Code

Making buildable under OpenBSD.

Browse Source
This commit is contained in:
David Carlier 2016-10-29 16:20:32 +01:00 committed by Paul Davis
parent 5f1d94a7b2
commit 28435d1a30
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/fst/scanner.cc
View File

@ -1,3 +1,4 @@
#define _POSIX_C_SOURCE 200809L
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

4
libs/midi++2/midi++/ipmidi_port.h
View File

@ -23,10 +23,12 @@
#include <iostream> #include <iostream>
#if defined(PLATFORM_WINDOWS) #if defined(PLATFORM_WINDOWS)
#include <winsock.h> #include <winsock.h>
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__OpenBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#if defined(__FreeBSD__)
#include <sys/_sockaddr_storage.h> #include <sys/_sockaddr_storage.h>
#endif
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/ip_carp.h> #include <netinet/ip_carp.h>
#include <sys/types.h> #include <sys/types.h>

11
wscript
View File

@ -576,7 +576,7 @@ int main() { return 0; }''',
if opt.stl_debug: if opt.stl_debug:
cxx_flags.append("-D_GLIBCXX_DEBUG") cxx_flags.append("-D_GLIBCXX_DEBUG")
if re.search ("freebsd", sys.platform) != None: if re.search ("freebsd", sys.platform) != None or re.search ("openbsd", sys.platform) != None:
linker_flags.append('-lexecinfo') linker_flags.append('-lexecinfo')
if conf.env['DEBUG_RT_ALLOC']: if conf.env['DEBUG_RT_ALLOC']:
@ -959,7 +959,7 @@ def configure(conf):
# executing a test program is n/a when cross-compiling # executing a test program is n/a when cross-compiling
if Options.options.dist_target != 'mingw': if Options.options.dist_target != 'mingw':
if Options.options.dist_target != 'msvc': if Options.options.dist_target != 'msvc' and re.search ("openbsd", sys.platform) == None:
if re.search ("freebsd", sys.platform) != None: if re.search ("freebsd", sys.platform) != None:
conf.check_cc(function_name='dlopen', header_name='dlfcn.h', uselib_store='DL') conf.check_cc(function_name='dlopen', header_name='dlfcn.h', uselib_store='DL')
else: else:
@ -974,6 +974,9 @@ def configure(conf):
if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw': if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw':
autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
if re.search ("openbsd", sys.platform) != None:
conf.env.append_value('LDFLAGS', '-L/usr/X11R6/lib')
autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.28', mandatory=True) autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.28', mandatory=True)
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True)
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True)
@ -1165,7 +1168,7 @@ int main () { return 0; }
if sys.platform == 'darwin': if sys.platform == 'darwin':
sub_config_and_use(conf, 'libs/appleutility') sub_config_and_use(conf, 'libs/appleutility')
elif Options.options.dist_target != 'mingw': elif Options.options.dist_target != 'mingw' and re.search ("openbsd", sys.platform) == None:
sub_config_and_use(conf, 'tools/sanity_check') sub_config_and_use(conf, 'tools/sanity_check')
sub_config_and_use(conf, 'tools/gccabicheck') sub_config_and_use(conf, 'tools/gccabicheck')
@ -1290,7 +1293,7 @@ def build(bld):
if sys.platform == 'darwin': if sys.platform == 'darwin':
bld.recurse('libs/appleutility') bld.recurse('libs/appleutility')
elif bld.env['build_target'] != 'mingw': elif bld.env['build_target'] != 'mingw' and re.search ("openbsd", sys.platform) == None:
bld.recurse('tools/sanity_check') bld.recurse('tools/sanity_check')
bld.recurse('tools/gccabicheck') bld.recurse('tools/gccabicheck')