* gnu/packages/build-tools.scm (meson): Update to 0.47.1. * gnu/packages/patches/meson-for-build-rpath.patch: Adjust to file rename and indendation change.
		
			
				
	
	
		
			24 lines
		
	
	
	
		
			1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			24 lines
		
	
	
	
		
			1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
This patch removes a part of meson that clears the rpath upon installation.
 | 
						|
This will only be applied to a special version of meson, used for the
 | 
						|
meson-build-system.
 | 
						|
 | 
						|
Patch by Peter Mikkelsen <petermikkelsen10@gmail.com>
 | 
						|
 | 
						|
--- meson-0.42.0/mesonbuild/minstall.py.orig	2017-09-09 01:49:39.147374148 +0200
 | 
						|
+++ meson-0.42.0/mesonbuild/minstall.py	2017-09-09 01:51:01.209134717 +0200
 | 
						|
@@ -436,15 +436,6 @@
 | 
						|
                         print("Symlink creation does not work on this platform. "
 | 
						|
                               "Skipping all symlinking.")
 | 
						|
                         printed_symlink_error = True
 | 
						|
-            if os.path.isfile(outname):
 | 
						|
-                try:
 | 
						|
-                    depfixer.fix_rpath(outname, install_rpath, final_path,
 | 
						|
-                                       install_name_mappings, verbose=False)
 | 
						|
-                except SystemExit as e:
 | 
						|
-                    if isinstance(e.code, int) and e.code == 0:
 | 
						|
-                        pass
 | 
						|
-                    else:
 | 
						|
-                        raise
 | 
						|
 
 | 
						|
 def run(args):
 | 
						|
     parser = buildparser()
 |