1 |
commit: 4d8fb5a3e08fb3e6d6b8161a1e94243bb5fbed14 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jan 29 09:23:25 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 20:09:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d8fb5a3 |
7 |
|
8 |
sci-visualization/nonolith-connect: remove unused patche/file |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3709 |
11 |
|
12 |
.../files/1.0.1-cflags-respect.patch | 69 ---------------------- |
13 |
.../files/60-nonolith-connect.rules | 3 - |
14 |
2 files changed, 72 deletions(-) |
15 |
|
16 |
diff --git a/sci-visualization/nonolith-connect/files/1.0.1-cflags-respect.patch b/sci-visualization/nonolith-connect/files/1.0.1-cflags-respect.patch |
17 |
deleted file mode 100644 |
18 |
index 46e0aed..00000000 |
19 |
--- a/sci-visualization/nonolith-connect/files/1.0.1-cflags-respect.patch |
20 |
+++ /dev/null |
21 |
@@ -1,69 +0,0 @@ |
22 |
---- SConstruct |
23 |
-+++ SConstruct |
24 |
-@@ -1,7 +1,21 @@ |
25 |
- import sys, os, shutil |
26 |
-+import SCons.Util |
27 |
- |
28 |
- env = Environment() |
29 |
- |
30 |
-+if os.environ.has_key('CC'): |
31 |
-+ env['CC'] = os.environ['CC'] |
32 |
-+if os.environ.has_key('CFLAGS'): |
33 |
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) |
34 |
-+if os.environ.has_key('CXX'): |
35 |
-+ env['CXX'] = os.environ['CXX'] |
36 |
-+if os.environ.has_key('CXXFLAGS'): |
37 |
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) |
38 |
-+if os.environ.has_key('LDFLAGS'): |
39 |
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) |
40 |
-+if "$CCFLAGS" in env['CXXCOM']: |
41 |
-+ env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","") |
42 |
-+ |
43 |
- opts = Variables() |
44 |
- opts.Add(BoolVariable("mingwcross", "Cross-compile with mingw for Win32", 0)) |
45 |
- opts.Add(BoolVariable("boost_static", "Statically link against Boost", 0)) |
46 |
-@@ -101,8 +115,7 @@ |
47 |
- sources = Glob('*.cpp') + ['cee/cee.cpp', 'bootloader/bootloader.cpp'] |
48 |
- |
49 |
- json = env.Library('json', |
50 |
-- Glob('libjson/Source/*.cpp'), |
51 |
-- CCFLAGS = "-c -O3 -ffast-math -fexpensive-optimizations".split() |
52 |
-+ Glob('libjson/Source/*.cpp') |
53 |
- ) |
54 |
- |
55 |
- websocketpp = env.Library('websocketpp', ['websocketpp/src/'+i for i in [ |
56 |
-@@ -113,7 +126,7 @@ |
57 |
- 'websocket_session.cpp', |
58 |
- 'sha1/sha1.cpp', |
59 |
- 'base64/base64.cpp' |
60 |
-- ]], CCFLAGS=['-g', '-O3']) |
61 |
-+ ]]) |
62 |
- |
63 |
- |
64 |
- libusb_cflags = [] |
65 |
-@@ -127,14 +140,21 @@ |
66 |
- libusb_os = ['os/poll_windows.c', 'os/windows_usb.c', 'os/threads_windows.c'] |
67 |
- libusb_cflags += ['-D OS_WINDOWS', '-DPOLL_NFDS_TYPE=unsigned int', '-D WINVER=0x0501'] |
68 |
- |
69 |
--libusb = env.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [ |
70 |
-+env_libusb = env.Clone() |
71 |
-+env_libusb.Append(CPPFLAGS=libusb_cflags) |
72 |
-+env_libusb.Append(CFLAGS=['-Ilibusb', '-Ilibusb/libusb']) |
73 |
-+ |
74 |
-+libusb = env_libusb.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [ |
75 |
- 'core.c', |
76 |
- 'descriptor.c', |
77 |
- 'io.c', |
78 |
- 'sync.c', |
79 |
-- ]+libusb_os], CFLAGS=['-g', '-O3', '-Ilibusb', '-Ilibusb/libusb']+libusb_cflags) |
80 |
-- |
81 |
-+ ]+libusb_os]) |
82 |
- |
83 |
- libs += boostlibs |
84 |
- |
85 |
--env.Program('nonolith-connect', sources, LIBS=libs, CCFLAGS=['-Wall', '-g', '-O3', '-Ilibusb', '-Iwebsocketpp/src', '-shared', "-DVERSION='%s'"%version], FRAMEWORKS=frameworks) |
86 |
-+env_main = env.Clone() |
87 |
-+env_main.Append(CPPFLAGS=["-DVERSION='%s'"%version]) |
88 |
-+env_main.Append(CXXFLAGS=['-Ilibusb', '-Iwebsocketpp/src', '-Wall']) |
89 |
-+#env_main.Append(LINKFLAGS=['-shared']) |
90 |
-+env_main.Program('nonolith-connect', sources, LIBS=libs, FRAMEWORKS=frameworks) |
91 |
|
92 |
diff --git a/sci-visualization/nonolith-connect/files/60-nonolith-connect.rules b/sci-visualization/nonolith-connect/files/60-nonolith-connect.rules |
93 |
deleted file mode 100644 |
94 |
index 63d44d0..00000000 |
95 |
--- a/sci-visualization/nonolith-connect/files/60-nonolith-connect.rules |
96 |
+++ /dev/null |
97 |
@@ -1,3 +0,0 @@ |
98 |
-SUBSYSTEM=="usb", ATTR{idVendor}=="59e3", ATTR{idProduct}=="cee1", GROUP:="nonolithd", MODE="0666" |
99 |
-SUBSYSTEM=="usb", ATTR{idVendor}=="59e3", ATTR{idProduct}=="b003", GROUP:="nonolithd", MODE="0666" |
100 |
-SUBSYSTEM=="usb", ATTR{idVendor}=="59e3", ATTR{idProduct}=="bbbb", GROUP:="nonolithd", MODE="0666" |