Skip to content

Commit e925469

Browse files
James ParkMarge Bot
James Park
authored and
Marge Bot
committed
meson: Add wrap for libelf on Windows
Uses release from Lag Free Games GitHub, which applies Windows build fixes to FreeBSD libelf. The amd_common library uses libelf. Reviewed-by: Jesse Natalie <[email protected]> Acked-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10202>
1 parent c93bd73 commit e925469

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

meson.build

+5-1
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,11 @@ with_opencl_native = _opencl != 'disabled' and get_option('opencl-native')
16861686
if (with_amd_vk or with_gallium_radeonsi or
16871687
(with_gallium_opencl and with_opencl_native) or
16881688
(with_gallium_r600 and with_llvm))
1689-
dep_elf = dependency('libelf', required : false)
1689+
if with_platform_windows
1690+
dep_elf = dependency('libelf', required : false, fallback : ['libelf', 'libelf_dep'])
1691+
else
1692+
dep_elf = dependency('libelf', required : false)
1693+
endif
16901694
if not dep_elf.found()
16911695
dep_elf = cc.find_library('elf')
16921696
endif

subprojects/libelf.wrap

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[wrap-git]
2+
directory = libelf-lfg-win32-1.0.0-freebsd-12.1.0
3+
4+
url = https://github.com/LagFreeGames/libelf-lfg-win32.git
5+
revision = 1.0.0
6+
depth = 1

0 commit comments

Comments
 (0)