diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2007-07-06 04:44:26 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2007-07-06 04:44:26 +0000 |
| commit | daa9b8917901ac4f997dd36a6ce1b43c3f4e8040 (patch) | |
| tree | c09fe235f6309a67f378386970d2ce72e949fd77 /net-p2p/deluge/files/patch-setup.py | |
| parent | - Added a dependency to devel/lasi to build the psttf driver on X. (diff) | |
Update to 0.5.2.
Notes
Notes:
svn path=/head/; revision=195045
Diffstat (limited to 'net-p2p/deluge/files/patch-setup.py')
| -rw-r--r-- | net-p2p/deluge/files/patch-setup.py | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py index 6c14fb6018da..42711e85d2dc 100644 --- a/net-p2p/deluge/files/patch-setup.py +++ b/net-p2p/deluge/files/patch-setup.py @@ -1,15 +1,24 @@ ---- setup.py.orig Sat Jun 9 12:16:40 2007 -+++ setup.py Sat Jun 9 12:19:31 2007 -@@ -100,7 +100,7 @@ +--- setup.py.orig Thu Jul 5 22:49:16 2007 ++++ setup.py Thu Jul 5 22:55:47 2007 +@@ -105,7 +105,7 @@ + + includedirs = ['./libtorrent', './libtorrent/include', + './libtorrent/include/libtorrent', +- '/usr/include/python' + python_version] ++ '%%LOCALBASE%%/include'] + + if OS == "linux": + if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7" /etc/issue')) == 0: +@@ -117,7 +117,7 @@ else: boosttype = 'mt' - removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes'] + removals = ['-g', '-Wstrict-prototypes'] - additions = ['-DNDEBUG', '-O2'] + additions = ['-DNDEBUG'] if python_version == '2.5': cv_opt = sysconfig.get_config_vars()["CFLAGS"] -@@ -131,19 +131,21 @@ +@@ -152,11 +152,11 @@ # Ubuntu possible. if boosttype == "nomt": librariestype = ['boost_filesystem', 'boost_date_time', @@ -22,15 +31,15 @@ + 'boost_thread-mt', 'z', 'ssl'] print 'Libraries mt' + def fetchCpp(): +@@ -175,8 +175,10 @@ + deluge_core = Extension('deluge_core', - include_dirs = ['./libtorrent', './libtorrent/include', - './libtorrent/include/libtorrent', -- '/usr/include/python' + python_version], -+ '%%LOCALBASE%%/include'], + include_dirs = includedirs, + 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', + sources = sources) + # Thanks to Iain Nicol for code to save the location for installed prefix + # At runtime, we need to know where we installed the data to. |