| @@ -1,35 +1,49 @@ | | | @@ -1,35 +1,49 @@ |
1 | $NetBSD: patch-aa,v 1.4 2017/02/14 09:54:30 markd Exp $ | | 1 | $NetBSD: patch-aa,v 1.5 2017/12/27 23:32:37 he Exp $ |
2 | | | 2 | |
3 | --- setup.py.orig 2017-01-07 16:04:26.000000000 +0000 | | 3 | Link with proper run-time library path, |
| | | 4 | link with -lpthread on NetBSD. |
| | | 5 | |
| | | 6 | --- setup.py.orig 2017-05-20 21:59:18.000000000 +0000 |
4 | +++ setup.py | | 7 | +++ setup.py |
5 | @@ -71,6 +71,7 @@ class build_ext(distutils.command.build_ | | 8 | @@ -71,6 +71,7 @@ class build_ext(distutils.command.build_ |
6 | fileName = os.path.splitext(self.get_ext_filename(ext.name))[0] | | 9 | fileName = os.path.splitext(self.get_ext_filename(ext.name))[0] |
7 | fullName = os.path.join(self.build_lib, fileName) | | 10 | fullName = os.path.join(self.build_lib, fileName) |
8 | libraryDirs = ext.library_dirs or [] | | 11 | libraryDirs = ext.library_dirs or [] |
9 | + runtimeLibraryDirs = ext.runtime_library_dirs or [] | | 12 | + runtimeLibraryDirs = ext.runtime_library_dirs or [] |
10 | libraries = self.get_libraries(ext) | | 13 | libraries = self.get_libraries(ext) |
11 | extraArgs = ext.extra_link_args or [] | | 14 | extraArgs = ext.extra_link_args or [] |
12 | if sys.platform == "win32": | | 15 | if sys.platform == "win32": |
13 | @@ -96,10 +97,12 @@ class build_ext(distutils.command.build_ | | 16 | @@ -96,10 +97,12 @@ class build_ext(distutils.command.build_ |
14 | if vars["LOCALMODLIBS"]: | | 17 | if vars["LOCALMODLIBS"]: |
15 | extraArgs.extend(vars["LOCALMODLIBS"].split()) | | 18 | extraArgs.extend(vars["LOCALMODLIBS"].split()) |
16 | extraArgs.append("-s") | | 19 | extraArgs.append("-s") |
17 | + runtimeLibraryDirs.append(sys.prefix + "/lib") | | 20 | + runtimeLibraryDirs.append(sys.prefix + "/lib") |
18 | + libraryDirs.append(sys.prefix + "/lib") | | 21 | + libraryDirs.append(sys.prefix + "/lib") |
19 | self.compiler.link_executable(objects, fullName, | | 22 | self.compiler.link_executable(objects, fullName, |
20 | libraries = libraries, | | 23 | libraries = libraries, |
21 | library_dirs = libraryDirs, | | 24 | library_dirs = libraryDirs, |
22 | - runtime_library_dirs = ext.runtime_library_dirs, | | 25 | - runtime_library_dirs = ext.runtime_library_dirs, |
23 | + runtime_library_dirs = runtimeLibraryDirs, | | 26 | + runtime_library_dirs = runtimeLibraryDirs, |
24 | extra_postargs = extraArgs, | | 27 | extra_postargs = extraArgs, |
25 | debug = self.debug) | | 28 | debug = self.debug) |
26 | | | 29 | |
27 | @@ -142,7 +145,7 @@ utilModule = Extension("cx_Freeze.util", | | 30 | @@ -136,13 +139,17 @@ if sys.platform == "win32": |
| | | 31 | if sys.platform == "win32": |
| | | 32 | libraries = ["imagehlp", "Shlwapi"] |
| | | 33 | else: |
| | | 34 | - libraries = [] |
| | | 35 | + if sys.platform.startswith('netbsd'): |
| | | 36 | + libraries = ["pthread"] |
| | | 37 | + else: |
| | | 38 | + libraries = [] |
| | | 39 | + |
| | | 40 | utilModule = Extension("cx_Freeze.util", ["source/util.c"], |
| | | 41 | libraries = libraries) |
28 | | | 42 | |
29 | # build base executables | | 43 | # build base executables |
30 | docFiles = "README.txt" | | 44 | docFiles = "README.txt" |
31 | -scripts = ["cxfreeze", "cxfreeze-quickstart"] | | 45 | -scripts = ["cxfreeze", "cxfreeze-quickstart"] |
32 | +scripts = ["cxfreeze" + sys.version[:3], "cxfreeze-quickstart" + sys.version[:3]] | | 46 | +scripts = ["cxfreeze" + sys.version[:3], "cxfreeze-quickstart" + sys.version[:3]] |
33 | options = dict(bdist_rpm = dict(doc_files = docFiles), | | 47 | options = dict(bdist_rpm = dict(doc_files = docFiles), |
34 | install = dict(optimize = 1)) | | 48 | install = dict(optimize = 1)) |
35 | depends = ["source/bases/Common.c"] | | 49 | depends = ["source/bases/Common.c"] |