Disable elfhack as long as it cause build problems
This commit is contained in:
		
							parent
							
								
									b2b84fc0dc
								
							
						
					
					
						commit
						d073fa532a
					
				
							
								
								
									
										12
									
								
								build-disable-elfhack.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								build-disable-elfhack.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,12 @@ | |||||||
|  | diff -up firefox-97.0/toolkit/moz.configure.disable-elfhack firefox-97.0/toolkit/moz.configure
 | ||||||
|  | --- firefox-97.0/toolkit/moz.configure.disable-elfhack	2022-02-08 09:58:47.518047952 +0100
 | ||||||
|  | +++ firefox-97.0/toolkit/moz.configure	2022-02-08 10:17:49.552945956 +0100
 | ||||||
|  | @@ -1273,7 +1273,7 @@ with only_when("--enable-compile-environ
 | ||||||
|  |              help="{Enable|Disable} elf hacks", | ||||||
|  |          ) | ||||||
|  |   | ||||||
|  | -        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: True))
 | ||||||
|  | +        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: False))
 | ||||||
|  |   | ||||||
|  |   | ||||||
|  |  @depends(build_environment) | ||||||
| @ -129,6 +129,7 @@ Patch418:       mozilla-1512162.patch | |||||||
| Patch419:        cbindgen-already-covers.patch | Patch419:        cbindgen-already-covers.patch | ||||||
| Patch420:        D154024.diff | Patch420:        D154024.diff | ||||||
| Patch421:        D153716-arc4random.diff | Patch421:        D153716-arc4random.diff | ||||||
|  | Patch422:        build-disable-elfhack.patch | ||||||
| #Patch419:       bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch | #Patch419:       bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch | ||||||
| Patch103:       rhbz-1219542-s390-build.patch | Patch103:       rhbz-1219542-s390-build.patch | ||||||
| # gcc 12 build fix patches | # gcc 12 build fix patches | ||||||
| @ -309,6 +310,9 @@ debug %{name}, you want to install %{name}-debuginfo instead. | |||||||
| #arc4random failures | #arc4random failures | ||||||
| %patch420 -p1 -b .D154024 | %patch420 -p1 -b .D154024 | ||||||
| %patch421 -p1 -b .D153716-arc4random | %patch421 -p1 -b .D153716-arc4random | ||||||
|  | %if 0%{?disable_elfhack} | ||||||
|  | %patch422 -p1 -b .build-disable-elfhack | ||||||
|  | %endif | ||||||
| # most likely fixed | # most likely fixed | ||||||
| #%patch419 -p1 -b .bindgen | #%patch419 -p1 -b .bindgen | ||||||
| 
 | 
 | ||||||
| @ -341,10 +345,6 @@ popd | |||||||
| %{__cat} %{SOURCE11} >> .mozconfig | %{__cat} %{SOURCE11} >> .mozconfig | ||||||
| %endif | %endif | ||||||
| 
 | 
 | ||||||
| %if 0%{?disable_elfhack} |  | ||||||
| echo "ac_add_options --disable-elfhack" >> .mozconfig |  | ||||||
| %endif |  | ||||||
| 
 |  | ||||||
| echo "ac_add_options --prefix=\"%{_prefix}\"" >> .mozconfig | echo "ac_add_options --prefix=\"%{_prefix}\"" >> .mozconfig | ||||||
| echo "ac_add_options --libdir=\"%{_libdir}\"" >> .mozconfig | echo "ac_add_options --libdir=\"%{_libdir}\"" >> .mozconfig | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user