Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/csound/files: csound-5.16.6-scons.patch
Date: Tue, 28 Feb 2012 21:19:49
Message-Id: 20120228211938.F28A32004C@flycatcher.gentoo.org
1 radhermit 12/02/28 21:19:38
2
3 Modified: csound-5.16.6-scons.patch
4 Log:
5 Fix scons build file to respect custom LDFLAGS.
6
7 (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-sound/csound/files/csound-5.16.6-scons.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-scons.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-scons.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-scons.patch?r1=1.1&r2=1.2
15
16 Index: csound-5.16.6-scons.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-sound/csound/files/csound-5.16.6-scons.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- csound-5.16.6-scons.patch 27 Feb 2012 05:37:48 -0000 1.1
23 +++ csound-5.16.6-scons.patch 28 Feb 2012 21:19:38 -0000 1.2
24 @@ -26,7 +26,24 @@
25 commandOptions.Add('buildStkOpcodes',
26 "Build opcodes encapsulating Perry Cook's Synthesis Toolkit in C++ instruments and effects",
27 '0')
28 -@@ -469,14 +481,6 @@
29 +@@ -352,6 +364,7 @@
30 + fileOptions.Add('customCXXFLAGS')
31 + fileOptions.Add('customLIBS')
32 + fileOptions.Add('customLIBPATH')
33 ++fileOptions.Add('customLINKFLAGS')
34 + fileOptions.Add('customSHLINKFLAGS')
35 + fileOptions.Add('customSWIGFLAGS')
36 + fileOptions.Update(commonEnvironment)
37 +@@ -366,6 +379,8 @@
38 + commonEnvironment.Prepend(LIBS = customLIBS)
39 + customLIBPATH = commonEnvironment['customLIBPATH']
40 + commonEnvironment.Prepend(LIBPATH = customLIBPATH)
41 ++customLINKFLAGS = commonEnvironment['customLINKFLAGS']
42 ++commonEnvironment.Prepend(LINKFLAGS = customLINKFLAGS)
43 + customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']
44 + commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)
45 + customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']
46 +@@ -469,14 +484,6 @@
47 if commonEnvironment['buildRelease'] == '0':
48 commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
49
50 @@ -41,7 +58,7 @@
51 if commonEnvironment['Word64'] == '1':
52 if compilerSun():
53 commonEnvironment.Append(CCFLAGS = ['-xcode=pic32'])
54 -@@ -494,10 +498,7 @@
55 +@@ -494,10 +501,7 @@
56 if getPlatform() == 'linux':
57 commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
58 commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
59 @@ -52,7 +69,7 @@
60 commonEnvironment.Append(CCFLAGS = ["-DPIPES"])
61 commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
62 elif getPlatform() == 'sunos':
63 -@@ -559,18 +560,17 @@
64 +@@ -559,18 +563,17 @@
65
66 if getPlatform() == 'linux':
67 path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
68 @@ -74,7 +91,7 @@
69 pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
70 elif getPlatform() == 'sunos':
71 path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
72 -@@ -777,6 +777,7 @@
73 +@@ -777,6 +780,7 @@
74 zlibhfound = configure.CheckHeader("zlib.h", language = "C")
75 midiPluginSdkFound = configure.CheckHeader("funknown.h", language = "C++")
76 luaFound = configure.CheckHeader("lua.h", language = "C")
77 @@ -82,7 +99,7 @@
78 #print 'LUA: %s' % (['no', 'yes'][int(luaFound)])
79 swigFound = 'swig' in commonEnvironment['TOOLS']
80 print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
81 -@@ -1452,7 +1453,7 @@
82 +@@ -1452,7 +1456,7 @@
83 swigflags = csoundWrapperEnvironment['SWIGFLAGS']
84 print 'swigflags:', swigflags
85 luaWrapper = None
86 @@ -91,7 +108,7 @@
87 print 'CONFIGURATION DECISION: Not building Lua wrapper to Csound C++ interface library.'
88 else:
89 print 'CONFIGURATION DECISION: Building Lua wrapper to Csound C++ interface library.'
90 -@@ -1510,6 +1511,9 @@
91 +@@ -1510,6 +1514,9 @@
92 javaWrapper = javaWrapperEnvironment.Program(
93 'lib_jcsound.jnilib', javaWrapperSources)
94 else:
95 @@ -101,7 +118,7 @@
96 javaWrapper = javaWrapperEnvironment.SharedLibrary(
97 '_jcsound', javaWrapperSources)
98 #Depends(javaWrapper, csoundLibrary)
99 -@@ -1759,9 +1763,12 @@
100 +@@ -1759,9 +1766,12 @@
101 jpluginEnvironment.Append(LINKFLAGS = ['-framework', 'Jackmp'])
102 makePlugin(jpluginEnvironment, 'jackTransport', 'Opcodes/jackTransport.c')
103 makePlugin(jpluginEnvironment, 'jacko', 'Opcodes/jacko.cpp')
104 @@ -116,7 +133,7 @@
105 makePlugin(pluginEnvironment, 'linear_algebra', 'Opcodes/linear_algebra.cpp')
106 print 'CONFIGURATION DECISION: Building linear algebra opcodes.'
107 else:
108 -@@ -1893,11 +1900,13 @@
109 +@@ -1893,11 +1903,13 @@
110 alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
111 makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
112
113 @@ -131,7 +148,7 @@
114
115 if getPlatform() == 'win32':
116 winmmEnvironment = pluginEnvironment.Clone()
117 -@@ -1963,9 +1972,7 @@
118 +@@ -1963,9 +1975,7 @@
119
120 # FLUIDSYNTH OPCODES
121
122 @@ -142,7 +159,7 @@
123 print "CONFIGURATION DECISION: Building fluid opcodes."
124 fluidEnvironment = pluginEnvironment.Clone()
125 if getPlatform() == 'win32':
126 -@@ -1981,6 +1988,8 @@
127 +@@ -1981,6 +1991,8 @@
128 fluidEnvironment.Append(LIBS = ['pthread'])
129 makePlugin(fluidEnvironment, 'fluidOpcodes',
130 ['Opcodes/fluidOpcodes/fluidOpcodes.cpp'])
131 @@ -151,7 +168,7 @@
132
133 # VST HOST OPCODES
134
135 -@@ -2174,7 +2183,7 @@
136 +@@ -2174,7 +2186,7 @@
137 if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
138 Depends(pythonOpcodes, pythonImportLibrary)
139
140 @@ -160,7 +177,7 @@
141
142 if not (commonEnvironment['buildLuaOpcodes'] != '0'):
143 print "CONFIGURATION DECISION: Not building Lua opcodes."
144 -@@ -2183,10 +2192,10 @@
145 +@@ -2183,10 +2195,10 @@
146 luaEnvironment = pluginEnvironment.Clone()
147
148 if getPlatform() == 'linux':
149 @@ -173,7 +190,7 @@
150 elif getPlatform() == 'win32':
151 if(luaFound == 1):
152 luaEnvironment.Append(LIBS = ['lua51'])
153 -@@ -2538,7 +2547,7 @@
154 +@@ -2538,7 +2550,7 @@
155 Depends(csoundAcPythonModule, pythonWrapper)
156 Depends(csoundAcPythonModule, csoundac)
157 Depends(csoundAcPythonModule, csnd)