mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	Issue #18517: merge from 3.3
This commit is contained in:
		
						commit
						b467d1542a
					
				
					 1 changed files with 9 additions and 8 deletions
				
			
		
							
								
								
									
										17
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										17
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -1534,6 +1534,15 @@ class db_found(Exception): pass
 | 
				
			||||||
        if '_tkinter' not in [e.name for e in self.extensions]:
 | 
					        if '_tkinter' not in [e.name for e in self.extensions]:
 | 
				
			||||||
            missing.append('_tkinter')
 | 
					            missing.append('_tkinter')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##         # Uncomment these lines if you want to play with xxmodule.c
 | 
				
			||||||
 | 
					##         ext = Extension('xx', ['xxmodule.c'])
 | 
				
			||||||
 | 
					##         self.extensions.append(ext)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if 'd' not in sys.abiflags:
 | 
				
			||||||
 | 
					            ext = Extension('xxlimited', ['xxlimited.c'],
 | 
				
			||||||
 | 
					                            define_macros=[('Py_LIMITED_API', 1)])
 | 
				
			||||||
 | 
					            self.extensions.append(ext)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return missing
 | 
					        return missing
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
 | 
					    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
 | 
				
			||||||
| 
						 | 
					@ -1731,14 +1740,6 @@ def detect_tkinter(self, inc_dirs, lib_dirs):
 | 
				
			||||||
                        )
 | 
					                        )
 | 
				
			||||||
        self.extensions.append(ext)
 | 
					        self.extensions.append(ext)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
##         # Uncomment these lines if you want to play with xxmodule.c
 | 
					 | 
				
			||||||
##         ext = Extension('xx', ['xxmodule.c'])
 | 
					 | 
				
			||||||
##         self.extensions.append(ext)
 | 
					 | 
				
			||||||
        if 'd' not in sys.abiflags:
 | 
					 | 
				
			||||||
            ext = Extension('xxlimited', ['xxlimited.c'],
 | 
					 | 
				
			||||||
                            define_macros=[('Py_LIMITED_API', 1)])
 | 
					 | 
				
			||||||
            self.extensions.append(ext)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        # XXX handle these, but how to detect?
 | 
					        # XXX handle these, but how to detect?
 | 
				
			||||||
        # *** Uncomment and edit for PIL (TkImaging) extension only:
 | 
					        # *** Uncomment and edit for PIL (TkImaging) extension only:
 | 
				
			||||||
        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
 | 
					        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue