| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132 |
- $OpenBSD: patch-SConstruct,v 1.5 2017/05/25 09:02:05 espie Exp $
- Remove custom optimize flags. Add flags after warning flags so we can remove
- some warnings
- Index: SConstruct
- --- SConstruct.orig
- +++ SConstruct
- @@ -441,7 +441,6 @@ deps = \
- 'gtk+-2.0' : '2.8.1',
- 'libxml-2.0' : '2.6.0',
- 'samplerate' : '0.1.0',
- - 'raptor2' : '2.0.0',
- 'lrdf' : '0.4.0',
- 'jack' : '0.120.0',
- 'libgnomecanvas-2.0' : '2.0',
- @@ -588,9 +587,6 @@ libraries['lrdf'].ParseConfig('pkg-config --cflags --l
- libraries['liblo'] = LibraryInfo()
- libraries['liblo'].ParseConfig('pkg-config --cflags --libs liblo')
-
- -libraries['raptor'] = LibraryInfo()
- -libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2')
- -
- libraries['sndfile'] = LibraryInfo()
- libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
-
- @@ -629,6 +625,9 @@ libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIB
- libraries['pbd'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd')
- libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext')
-
- +libraries['execinfo'] = LibraryInfo (LIBS='execinfo')
- +conf = Configure(libraries['execinfo'])
- +conf.Finish()
-
- # SCons should really do this for us
-
- @@ -678,6 +677,9 @@ if env['DIST_TARGET'] == 'auto':
- else:
- env['DIST_TARGET'] = 'leopard'
- else:
- + if re.search("openbsd", config[config_kernel]):
- + if config[config_cpu] == 'amd64':
- + config[config_cpu] = 'x86_64'
- if re.search ("x86_64", config[config_cpu]) != None:
- env['DIST_TARGET'] = 'x86_64'
- elif re.search("i[0-5]86", config[config_cpu]) != None:
- @@ -698,6 +700,7 @@ if env['DIST_TARGET'] != 'tiger' and env['DIST_TARGET'
- env['AUSTATE'] = 0
- env['WITH_CARBON'] = 0
-
- +build_host_supports_sse = 0
- if config[config_cpu] == 'powerpc' and env['DIST_TARGET'] != 'none':
- # Apple/PowerPC optimization options
- #
- @@ -839,11 +842,6 @@ if env['ARCH'] != '':
- #
-
- opt_flags[:0] = [
- - "-O3",
- - "-fomit-frame-pointer",
- - "-ffast-math",
- - "-fstrength-reduce",
- - "-pipe"
- ]
-
- if env['DEBUG'] == 1:
- @@ -860,14 +858,15 @@ if env['UNIVERSAL'] == 1:
- env.Append(CCFLAGS="-arch i386 -arch ppc")
- env.Append(LINKFLAGS="-arch i386 -arch ppc")
-
- -
- #
- -# warnings flags
- +# warnings flags and user
- #
-
- -env.Append(CCFLAGS="-Wall")
- -env.Append(CXXFLAGS="-Woverloaded-virtual")
- +env.Append(CCFLAGS="-Wall ${CFLAGS}")
- +env.Append(CXXFLAGS="-Woverloaded-virtual ${CXXFLAGS}")
-
- +env.Append(LINKFLAGS="-Wl,-rpath,${LOCALBASE}/lib/ardour2")
- +
- if env['EXTRA_WARN']:
- env.Append(CCFLAGS="-Wextra -pedantic -ansi")
- env.Append(CXXFLAGS="-ansi")
- @@ -930,6 +929,7 @@ libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk
-
- env['RUBBERBAND'] = False
-
- +env.Merge([libraries['fftw3f']])
- conf = Configure (env)
-
- if conf.CheckHeader ('fftw3.h'):
- @@ -953,8 +953,11 @@ conf.Finish()
- #
- # Check for libusb
-
- -libraries['usb'] = LibraryInfo ()
- +libraries['usb'] = LibraryInfo ( )
- prep_libcheck(env, libraries['usb'])
- +# I have no idea why this does not work
- +libraries['usb'].Append(CPPPATH = [ '${LOCALBASE}/include' ])
- +libraries['usb'].Append(LIBPATH = [ '${LOCALBASE}/lib' ])
-
- conf = Configure (libraries['usb'])
- if conf.CheckLib ('usb', 'usb_interrupt_write'):
- @@ -1062,6 +1065,11 @@ elif conf.CheckCHeader('/System/Library/Frameworks/Cor
- env['SYSMIDI'] = 'CoreMIDI'
- subst_dict['%MIDITAG%'] = "ardour"
- subst_dict['%MIDITYPE%'] = "coremidi"
- +elif conf.CheckHeader("sndio.h"):
- + libraries['sysmidi'] = LibraryInfo (LIBS='sndio')
- + env['SYSMIDI'] = 'SndioMIDI'
- + subst_dict['%MIDITAG%'] = "ardour"
- + subst_dict['%MIDITYPE%'] = "sndio"
- else:
- print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
- sys.exit (1)
- @@ -1284,11 +1292,7 @@ subst_dict['%INSTALL_PREFIX%'] = install_prefix;
- subst_dict['%FINAL_PREFIX%'] = final_prefix;
- subst_dict['%PREFIX%'] = final_prefix;
-
- -if env['PREFIX'] == '/usr':
- - final_config_prefix = '/etc'
- -else:
- - final_config_prefix = env['PREFIX'] + '/etc'
- -
- +final_config_prefix = '/etc'
- config_prefix = '$DESTDIR' + final_config_prefix
-
- #
|
