summaryrefslogtreecommitdiff
path: root/net-p2p/deluge/files/patch-setup.py
blob: 6c14fb6018da16c1252156ddb5606e32f77347ec (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
--- setup.py.orig	Sat Jun  9 12:16:40 2007
+++ setup.py	Sat Jun  9 12:19:31 2007
@@ -100,7 +100,7 @@
 	else:
 		boosttype = 'mt'
 	removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
-        additions = ['-DNDEBUG', '-O2']
+        additions = ['-DNDEBUG']
 
 	if python_version == '2.5':
 		cv_opt = sysconfig.get_config_vars()["CFLAGS"]
@@ -131,19 +131,21 @@
 # Ubuntu possible.
 if boosttype == "nomt":
 	librariestype = ['boost_filesystem', 'boost_date_time',
-			'boost_thread', 'z', 'pthread', 'ssl']
+			'boost_thread', 'z', 'ssl']
 	print 'Libraries nomt' 
 elif boosttype == "mt":
 	librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
-			'boost_thread-mt', 'z', 'pthread', 'ssl']
+			'boost_thread-mt', 'z', 'ssl']
 	print 'Libraries mt'
 
 deluge_core = Extension('deluge_core',
                     include_dirs = ['./libtorrent', './libtorrent/include', 
                     			'./libtorrent/include/libtorrent', 
-                    			'/usr/include/python' + python_version],
+                    			'%%LOCALBASE%%/include'],
+                    library_dirs = ['%%LOCALBASE%%/lib'],
 		    libraries = librariestype,
                     extra_compile_args = EXTRA_COMPILE_ARGS,
+                    extra_link_args = ['%%PTHREAD_LIBS%%'],
                     sources = ['src/deluge_core.cpp',
 					'libtorrent/src/alert.cpp',
 					'libtorrent/src/allocate_resources.cpp',