mesa: update and fix tls patch
This commit is contained in:
		
							parent
							
								
									ac86355b81
								
							
						
					
					
						commit
						e1d9f7cae4
					
				
					 2 changed files with 16 additions and 15 deletions
				
			
		|  | @ -1,15 +1,3 @@ | |||
| --- a/meson.build
 | ||||
| +++ b/meson.build
 | ||||
| @@ -448,7 +448,8 @@
 | ||||
|   | ||||
|  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. | ||||
|  use_elf_tls = false | ||||
| -if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
 | ||||
| +with_use_elf_tls = get_option('use-elf-tls')
 | ||||
| +if with_use_elf_tls and not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
 | ||||
|    pre_args += '-DUSE_ELF_TLS' | ||||
|    use_elf_tls = true | ||||
|  endif | ||||
| --- a/meson_options.txt
 | ||||
| +++ b/meson_options.txt
 | ||||
| @@ -464,3 +464,9 @@
 | ||||
|  | @ -22,3 +10,15 @@ | |||
| +  value : false,
 | ||||
| +  description : 'Build support for initial-exec TLS model'
 | ||||
| +)
 | ||||
| --- a/meson.build
 | ||||
| +++ b/meson.build
 | ||||
| @@ -447,7 +447,8 @@
 | ||||
|   | ||||
|  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. | ||||
|  use_elf_tls = false | ||||
| -if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
 | ||||
| +with_use_elf_tls = get_option('use-elf-tls')
 | ||||
| +if with_use_elf_tls and (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
 | ||||
|      (not with_platform_android or get_option('platform-sdk-version') >= 29) and | ||||
|      (not with_platform_windows or not with_shared_glapi)) | ||||
|    pre_args += '-DUSE_ELF_TLS' | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| pkgname=mesa | ||||
| pkgver=21.1.0-rc3 | ||||
| pkgver=21.1.1 | ||||
| deps="musl:wayland:wayland-protocols:llvm:zlib:expat:libffi:libdrm:python-mako" | ||||
| ext=dev | ||||
| 
 | ||||
|  | @ -20,8 +20,8 @@ build() { | |||
| 	meson .. \ | ||||
| 		--prefix=/usr \ | ||||
| 		-Dplatforms=wayland \ | ||||
| 		-Ddri3=true \ | ||||
| 		-Ddri-drivers=i915,i965 \ | ||||
| 		-Ddri3=true \ | ||||
| 		-Dgallium-drivers=iris \ | ||||
| 		-Dgallium-vdpau=false \ | ||||
| 		-Dgallium-xvmc=false \ | ||||
|  | @ -46,7 +46,8 @@ build() { | |||
| 		-Dvalgrind=false \ | ||||
| 		-Dlibunwind=false \ | ||||
| 		-Dlmsensors=false \ | ||||
| 		-Dbuild-tests=false | ||||
| 		-Dbuild-tests=false \ | ||||
| 		-Duse-elf-tls=false | ||||
| 
 | ||||
| 	samu | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue