-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pythonPackages.tkinter: fix darwin build
- Loading branch information
Showing
9 changed files
with
202 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
diff --git a/setup.py b/setup.py | ||
index 2779658..902d0eb 100644 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): | ||
# Rather than complicate the code below, detecting and building | ||
# AquaTk is a separate method. Only one Tkinter will be built on | ||
# Darwin - either AquaTk, if it is found, or X11 based Tk. | ||
- if (host_platform == 'darwin' and | ||
- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): | ||
- return | ||
|
||
# Assume we haven't found any of the libraries or include files | ||
# The versions with dots are used on Unix, and the versions without | ||
@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): | ||
if dir not in include_dirs: | ||
include_dirs.append(dir) | ||
|
||
- # Check for various platform-specific directories | ||
- if host_platform == 'sunos5': | ||
- include_dirs.append('/usr/openwin/include') | ||
- added_lib_dirs.append('/usr/openwin/lib') | ||
- elif os.path.exists('/usr/X11R6/include'): | ||
- include_dirs.append('/usr/X11R6/include') | ||
- added_lib_dirs.append('/usr/X11R6/lib64') | ||
- added_lib_dirs.append('/usr/X11R6/lib') | ||
- elif os.path.exists('/usr/X11R5/include'): | ||
- include_dirs.append('/usr/X11R5/include') | ||
- added_lib_dirs.append('/usr/X11R5/lib') | ||
- else: | ||
- # Assume default location for X11 | ||
- include_dirs.append('/usr/X11/include') | ||
- added_lib_dirs.append('/usr/X11/lib') | ||
- | ||
# If Cygwin, then verify that X is installed before proceeding | ||
if host_platform == 'cygwin': | ||
x11_inc = find_file('X11/Xlib.h', [], include_dirs) | ||
@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): | ||
if host_platform in ['aix3', 'aix4']: | ||
libs.append('ld') | ||
|
||
- # Finally, link with the X11 libraries (not appropriate on cygwin) | ||
- if host_platform != "cygwin": | ||
- libs.append('X11') | ||
- | ||
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], | ||
define_macros=[('WITH_APPINIT', 1)] + defs, | ||
include_dirs = include_dirs, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
diff --git a/setup.py b/setup.py | ||
index 2779658..902d0eb 100644 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): | ||
# Rather than complicate the code below, detecting and building | ||
# AquaTk is a separate method. Only one Tkinter will be built on | ||
# Darwin - either AquaTk, if it is found, or X11 based Tk. | ||
- if (host_platform == 'darwin' and | ||
- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): | ||
- return | ||
|
||
# Assume we haven't found any of the libraries or include files | ||
# The versions with dots are used on Unix, and the versions without | ||
@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): | ||
if dir not in include_dirs: | ||
include_dirs.append(dir) | ||
|
||
- # Check for various platform-specific directories | ||
- if host_platform == 'sunos5': | ||
- include_dirs.append('/usr/openwin/include') | ||
- added_lib_dirs.append('/usr/openwin/lib') | ||
- elif os.path.exists('/usr/X11R6/include'): | ||
- include_dirs.append('/usr/X11R6/include') | ||
- added_lib_dirs.append('/usr/X11R6/lib64') | ||
- added_lib_dirs.append('/usr/X11R6/lib') | ||
- elif os.path.exists('/usr/X11R5/include'): | ||
- include_dirs.append('/usr/X11R5/include') | ||
- added_lib_dirs.append('/usr/X11R5/lib') | ||
- else: | ||
- # Assume default location for X11 | ||
- include_dirs.append('/usr/X11/include') | ||
- added_lib_dirs.append('/usr/X11/lib') | ||
- | ||
# If Cygwin, then verify that X is installed before proceeding | ||
if host_platform == 'cygwin': | ||
x11_inc = find_file('X11/Xlib.h', [], include_dirs) | ||
@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): | ||
if host_platform in ['aix3', 'aix4']: | ||
libs.append('ld') | ||
|
||
- # Finally, link with the X11 libraries (not appropriate on cygwin) | ||
- if host_platform != "cygwin": | ||
- libs.append('X11') | ||
- | ||
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], | ||
define_macros=[('WITH_APPINIT', 1)] + defs, | ||
include_dirs = include_dirs, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
diff --git a/setup.py b/setup.py | ||
index 2779658..902d0eb 100644 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): | ||
# Rather than complicate the code below, detecting and building | ||
# AquaTk is a separate method. Only one Tkinter will be built on | ||
# Darwin - either AquaTk, if it is found, or X11 based Tk. | ||
- if (host_platform == 'darwin' and | ||
- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): | ||
- return | ||
|
||
# Assume we haven't found any of the libraries or include files | ||
# The versions with dots are used on Unix, and the versions without | ||
@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): | ||
if dir not in include_dirs: | ||
include_dirs.append(dir) | ||
|
||
- # Check for various platform-specific directories | ||
- if host_platform == 'sunos5': | ||
- include_dirs.append('/usr/openwin/include') | ||
- added_lib_dirs.append('/usr/openwin/lib') | ||
- elif os.path.exists('/usr/X11R6/include'): | ||
- include_dirs.append('/usr/X11R6/include') | ||
- added_lib_dirs.append('/usr/X11R6/lib64') | ||
- added_lib_dirs.append('/usr/X11R6/lib') | ||
- elif os.path.exists('/usr/X11R5/include'): | ||
- include_dirs.append('/usr/X11R5/include') | ||
- added_lib_dirs.append('/usr/X11R5/lib') | ||
- else: | ||
- # Assume default location for X11 | ||
- include_dirs.append('/usr/X11/include') | ||
- added_lib_dirs.append('/usr/X11/lib') | ||
- | ||
# If Cygwin, then verify that X is installed before proceeding | ||
if host_platform == 'cygwin': | ||
x11_inc = find_file('X11/Xlib.h', [], include_dirs) | ||
@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): | ||
if host_platform in ['aix3', 'aix4']: | ||
libs.append('ld') | ||
|
||
- # Finally, link with the X11 libraries (not appropriate on cygwin) | ||
- if host_platform != "cygwin": | ||
- libs.append('X11') | ||
- | ||
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], | ||
define_macros=[('WITH_APPINIT', 1)] + defs, | ||
include_dirs = include_dirs, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
diff --git a/setup.py b/setup.py | ||
index 2779658..902d0eb 100644 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): | ||
# Rather than complicate the code below, detecting and building | ||
# AquaTk is a separate method. Only one Tkinter will be built on | ||
# Darwin - either AquaTk, if it is found, or X11 based Tk. | ||
- if (host_platform == 'darwin' and | ||
- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): | ||
- return | ||
|
||
# Assume we haven't found any of the libraries or include files | ||
# The versions with dots are used on Unix, and the versions without | ||
@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): | ||
if dir not in include_dirs: | ||
include_dirs.append(dir) | ||
|
||
- # Check for various platform-specific directories | ||
- if host_platform == 'sunos5': | ||
- include_dirs.append('/usr/openwin/include') | ||
- added_lib_dirs.append('/usr/openwin/lib') | ||
- elif os.path.exists('/usr/X11R6/include'): | ||
- include_dirs.append('/usr/X11R6/include') | ||
- added_lib_dirs.append('/usr/X11R6/lib64') | ||
- added_lib_dirs.append('/usr/X11R6/lib') | ||
- elif os.path.exists('/usr/X11R5/include'): | ||
- include_dirs.append('/usr/X11R5/include') | ||
- added_lib_dirs.append('/usr/X11R5/lib') | ||
- else: | ||
- # Assume default location for X11 | ||
- include_dirs.append('/usr/X11/include') | ||
- added_lib_dirs.append('/usr/X11/lib') | ||
- | ||
# If Cygwin, then verify that X is installed before proceeding | ||
if host_platform == 'cygwin': | ||
x11_inc = find_file('X11/Xlib.h', [], include_dirs) | ||
@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): | ||
if host_platform in ['aix3', 'aix4']: | ||
libs.append('ld') | ||
|
||
- # Finally, link with the X11 libraries (not appropriate on cygwin) | ||
- if host_platform != "cygwin": | ||
- libs.append('X11') | ||
- | ||
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], | ||
define_macros=[('WITH_APPINIT', 1)] + defs, | ||
include_dirs = include_dirs, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters