← Back to branch summary

~ubuntu-branches/ubuntu/precise/csound/precise

« back to all changes in this revision

Viewing changes to installer/linux/fedora/csound-5.13.0-no-usr-local.patch

  • Committer: Package Import Robot
  • Author(s): Felipe Sateler
  • Date: 2012-04-19 09:26:46 UTC
  • mfrom: (3.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20120419092646-96xbj1n6atuqosk2
Tags: 1:5.17.6~dfsg-1
* New upstream release
 - Do not build the wiimote opcodes (we need wiiuse).
* Add new API function to symbols file
* Disable lua opcodes, they were broken. Requires OpenMP to be enabled.
* Backport fixes from upstream:
  - Link dssi4cs with dl. Backport
  - Fix building of CsoundAC

Show diffs side-by-side

added added

removed removed

Lines of Context:
installer/linux/fedora/csound-5.13.0-no-usr-local.patch
 
1
--- Csound5.13.0/SConstruct.orig        2011-04-07 07:12:40.477602580 +0100
 
2
+++ Csound5.13.0/SConstruct     2011-04-07 07:15:29.884656314 +0100
 
3
@@ -503,9 +503,9 @@
 
4
     if getPlatform() == 'sunos':
 
5
         commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/lib/64', '/usr/lib/64'])
 
6
     else:
 
7
-        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
 
8
+        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/lib64'])
 
9
 else:
 
10
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
 
11
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/lib'])
 
12
 
 
13
 if commonEnvironment['Word64'] == '1':
 
14
     if compilerSun():
 
15
@@ -531,7 +531,7 @@
 
16
     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
 
17
 elif getPlatform() == 'sunos':
 
18
     commonEnvironment.Append(CCFLAGS = "-D_SOLARIS")
 
19
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
 
20
+    commonEnvironment.Append(CPPPATH = '/usr/include')
 
21
     commonEnvironment.Append(CPPPATH = '/usr/include')
 
22
     commonEnvironment.Append(CPPPATH = '/usr/jdk/instances/jdk1.5.0/include')
 
23
     if compilerGNU():
 
24
@@ -539,7 +539,7 @@
 
25
         commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
 
26
 elif getPlatform() == 'darwin':
 
27
     commonEnvironment.Append(CCFLAGS = "-DMACOSX")
 
28
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
 
29
+    commonEnvironment.Append(CPPPATH = '/usr/include')
 
30
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
 
31
     if commonEnvironment['useAltivec'] == '1':
 
32
         print 'CONFIGURATION DECISION: Using Altivec optimisation'
 
33
@@ -556,7 +556,7 @@
 
34
     commonEnvironment.Append(CXXFLAGS = '-DFL_DLL')
 
35
     if compilerGNU():
 
36
         commonEnvironment.Prepend(CCFLAGS = "-Wall")
 
37
-        commonEnvironment.Append(CPPPATH = '/usr/local/include')
 
38
+        commonEnvironment.Append(CPPPATH = '/usr/include')
 
39
         commonEnvironment.Append(CPPPATH = '/usr/include')
 
40
         commonEnvironment.Append(SHLINKFLAGS = Split(' -mno-cygwin -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc'))
 
41
         commonEnvironment.Append(LINKFLAGS = Split(' -mno-cygwin -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc'))
 
42
@@ -602,13 +602,13 @@
 
43
     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
 
44
 elif getPlatform() == 'sunos':
 
45
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
 
46
-    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
 
47
+    path2 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
 
48
     pythonIncludePath = [path1, path2]
 
49
     pythonLinkFlags = []
 
50
     if commonEnvironment['Lib64'] == '1':
 
51
-        pythonLibraryPath = ['/usr/local/lib/64', '/usr/lib/64']
 
52
+        pythonLibraryPath = ['/usr/lib/64', '/usr/lib/64']
 
53
     else:
 
54
-        pythonLibraryPath = ['/usr/local/lib', '/usr/lib']
 
55
+        pythonLibraryPath = ['/usr/lib', '/usr/lib']
 
56
     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
 
57
     tclIncludePath = []
 
58
 elif getPlatform() == 'darwin':
 
59
@@ -1340,10 +1340,10 @@
 
60
     PYDLL = r'%s\%s' % (os.environ['SystemRoot'], pythonLibs[0])
 
61
 if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and compilerGNU():
 
62
     pythonImportLibrary = csoundInterfacesEnvironment.Command(
 
63
-        '/usr/local/lib/lib%s.a' % (pythonLibs[0]),
 
64
+        '/usr/lib/lib%s.a' % (pythonLibs[0]),
 
65
         PYDLL,
 
66
         ['pexports %s > %s.def' % (PYDLL, pythonLibs[0]),
 
67
-         'dlltool --input-def %s.def --dllname %s.dll --output-lib /usr/local/lib/lib%s.a' % (pythonLibs[0], PYDLL, pythonLibs[0])])
 
68
+         'dlltool --input-def %s.def --dllname %s.dll --output-lib /usr/lib/lib%s.a' % (pythonLibs[0], PYDLL, pythonLibs[0])])
 
69
 
 
70
 def fixCFlagsForSwig(env):
 
71
     if '-pedantic' in env['CCFLAGS']: