/[gentoo-x86]/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
Gentoo

Contents of /sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Thu Mar 22 10:15:45 2012 UTC (7 years, 11 months ago) by chainsaw
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
New upstream release which implements a REST API and adds advanced trigger modes for future use. Udev rule has been removed, not needed due to USB initial group on nonolith-connect user.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

1 diff -uNr nonolith-connect-1.1.ORIG/SConstruct nonolith-connect-1.1/SConstruct
2 --- nonolith-connect-1.1.ORIG/SConstruct 2012-03-22 10:02:11.398944187 +0000
3 +++ nonolith-connect-1.1/SConstruct 2012-03-22 10:05:23.149936839 +0000
4 @@ -1,7 +1,21 @@
5 import sys, os, shutil
6 +import SCons.Util
7
8 env = Environment()
9
10 +if os.environ.has_key('CC'):
11 + env['CC'] = os.environ['CC']
12 +if os.environ.has_key('CFLAGS'):
13 + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
14 +if os.environ.has_key('CXX'):
15 + env['CXX'] = os.environ['CXX']
16 +if os.environ.has_key('CXXFLAGS'):
17 + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
18 +if os.environ.has_key('LDFLAGS'):
19 + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
20 +if "$CCFLAGS" in env['CXXCOM']:
21 + env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","")
22 +
23 opts = Variables()
24 opts.Add(BoolVariable("mingwcross", "Cross-compile with mingw for Win32", 0))
25 opts.Add(BoolVariable("boost_static", "Statically link against Boost", 0))
26 @@ -95,8 +109,7 @@
27 sources = Glob('*.cpp') + Glob('streaming_device/*.cpp') + ['cee/cee.cpp', 'bootloader/bootloader.cpp']
28
29 json = env.Library('json',
30 - Glob('libjson/Source/*.cpp'),
31 - CCFLAGS = "-c -O3 -ffast-math -fexpensive-optimizations".split()
32 + Glob('libjson/Source/*.cpp')
33 )
34
35 websocketpp = env.Library('websocketpp', ['websocketpp/src/'+i for i in [
36 @@ -107,7 +120,7 @@
37 'websocket_session.cpp',
38 'sha1/sha1.cpp',
39 'base64/base64.cpp'
40 - ]], CCFLAGS=['-g', '-O3'])
41 + ]])
42
43
44 libusb_cflags = []
45 @@ -121,14 +134,22 @@
46 libusb_os = ['os/poll_windows.c', 'os/windows_usb.c', 'os/threads_windows.c']
47 libusb_cflags += ['-D OS_WINDOWS', '-DPOLL_NFDS_TYPE=unsigned int', '-D WINVER=0x0501']
48
49 -libusb = env.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
50 +env_libusb = env.Clone()
51 +env_libusb.Append(CPPFLAGS=libusb_cflags)
52 +env_libusb.Append(CFLAGS=['-Ilibusb', '-Ilibusb/libusb'])
53 +
54 +libusb = env_libusb.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
55 'core.c',
56 'descriptor.c',
57 'io.c',
58 'sync.c',
59 - ]+libusb_os], CFLAGS=['-g', '-O3', '-Ilibusb', '-Ilibusb/libusb']+libusb_cflags)
60 + ]+libusb_os])
61
62
63 libs += boostlibs
64
65 -env.Program('nonolith-connect', sources, LIBS=libs, CCFLAGS=['-Wall', '-g', '-O3', '-Ilibusb', '-Iwebsocketpp/src', '-shared'], FRAMEWORKS=frameworks)
66 +env_main = env.Clone()
67 +env_main.Append(CXXFLAGS=['-Ilibusb', '-Iwebsocketpp/src', '-Wall'])
68 +#env_main.Append(LINKFLAGS=['-shared'])
69 +env_main.Program('nonolith-connect', sources, LIBS=libs, FRAMEWORKS=frameworks)
70 +

  ViewVC Help
Powered by ViewVC 1.1.20