mirror of
				https://github.com/python/cpython.git
				synced 2025-11-04 07:31:38 +00:00 
			
		
		
		
	Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems. Will backport.
This commit is contained in:
		
							parent
							
								
									fd963265e2
								
							
						
					
					
						commit
						0a2032673c
					
				
					 2 changed files with 15 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -185,9 +185,7 @@ def finalize_options (self):
 | 
			
		|||
 | 
			
		||||
        # for extensions under Cygwin and AtheOS Python's library directory must be
 | 
			
		||||
        # appended to library_dirs
 | 
			
		||||
        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
 | 
			
		||||
               ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
 | 
			
		||||
                sysconfig.get_config_var('Py_ENABLE_SHARED')):
 | 
			
		||||
        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
 | 
			
		||||
            if string.find(sys.executable, sys.exec_prefix) != -1:
 | 
			
		||||
                # building third party extensions
 | 
			
		||||
                self.library_dirs.append(os.path.join(sys.prefix, "lib",
 | 
			
		||||
| 
						 | 
				
			
			@ -197,6 +195,17 @@ def finalize_options (self):
 | 
			
		|||
                # building python standard extensions
 | 
			
		||||
                self.library_dirs.append('.')
 | 
			
		||||
 | 
			
		||||
        # for extensions under Linux with a shared Python library,
 | 
			
		||||
        # Python's library directory must be appended to library_dirs
 | 
			
		||||
        if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
 | 
			
		||||
                and sysconfig.get_config_var('Py_ENABLE_SHARED'):
 | 
			
		||||
            if string.find(sys.executable, sys.exec_prefix) != -1:
 | 
			
		||||
                # building third party extensions
 | 
			
		||||
                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
 | 
			
		||||
            else:
 | 
			
		||||
                # building python standard extensions
 | 
			
		||||
                self.library_dirs.append('.')
 | 
			
		||||
 | 
			
		||||
        # The argument parsing will result in self.define being a string, but
 | 
			
		||||
        # it has to be a list of 2-tuples.  All the preprocessor symbols
 | 
			
		||||
        # specified by the 'define' option will be set to '1'.  Multiple
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -128,6 +128,9 @@ Core and builtins
 | 
			
		|||
Library
 | 
			
		||||
-------
 | 
			
		||||
 | 
			
		||||
- Bug #1600860: Search for shared python library in LIBDIR, not lib/python/config,
 | 
			
		||||
  on "linux" and "gnu" systems.
 | 
			
		||||
 | 
			
		||||
- Patch #1652681: tarfile.py: create nonexistent files in append mode and
 | 
			
		||||
  allow appending to empty files.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue