mirror of
				https://github.com/python/cpython.git
				synced 2025-11-04 07:31:38 +00:00 
			
		
		
		
	Patch #103578 ] _tkinter build fix for he current Debian unstable tcl/tk 8.3
packages
This commit is contained in:
		
							parent
							
								
									69e7f11aa8
								
							
						
					
					
						commit
						9a3fd8c82f
					
				
					 1 changed files with 4 additions and 8 deletions
				
			
		
							
								
								
									
										12
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										12
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -495,14 +495,10 @@ def detect_tkinter(self, inc_dirs, lib_dirs):
 | 
				
			||||||
        if tklib and tcllib:
 | 
					        if tklib and tcllib:
 | 
				
			||||||
            # Check for the include files on Debian, where
 | 
					            # Check for the include files on Debian, where
 | 
				
			||||||
            # they're put in /usr/include/{tcl,tk}X.Y
 | 
					            # they're put in /usr/include/{tcl,tk}X.Y
 | 
				
			||||||
            debian_tcl_include = ( '/usr/include/tcl' + version )
 | 
					            debian_tcl_include = [ '/usr/include/tcl' + version ]
 | 
				
			||||||
            debian_tk_include =  ( '/usr/include/tk'  + version )
 | 
					            debian_tk_include =  [ '/usr/include/tk'  + version ] + debian_tcl_include
 | 
				
			||||||
            tcl_includes = find_file('tcl.h', inc_dirs,
 | 
					            tcl_includes = find_file('tcl.h', inc_dirs, debian_tcl_include)
 | 
				
			||||||
                                     [debian_tcl_include]
 | 
					            tk_includes = find_file('tk.h', inc_dirs, debian_tk_include)
 | 
				
			||||||
                                     )
 | 
					 | 
				
			||||||
            tk_includes = find_file('tk.h', inc_dirs,
 | 
					 | 
				
			||||||
                                     [debian_tk_include]
 | 
					 | 
				
			||||||
                                     )
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (tcllib is None or tklib is None and
 | 
					        if (tcllib is None or tklib is None and
 | 
				
			||||||
            tcl_includes is None or tk_includes is None):
 | 
					            tcl_includes is None or tk_includes is None):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue