Skip to content

Commit f0ab9c5

Browse files
committed
mesa: avoid opportunistic usage of libelf
1 parent dcfd03c commit f0ab9c5

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

x11/mesa/Portfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ patchfiles patch-meson-spec-python.diff \
6060
patch-fix-build.diff \
6161
patch-fix-linking.diff \
6262
patch-fix-32-bit.diff \
63-
patch-meson.build.diff
63+
patch-meson.build.diff \
64+
patch-no-libelf-on-darwin.diff
6465

6566
# To be replaced with upstream fix, hopefully:
6667
patchfiles-append patch-frontend_screen.diff
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--- meson.build.orig 2024-12-16 14:55:52.000000000 +0800
2+
+++ meson.build 2024-12-16 17:38:27.000000000 +0800
3+
@@ -1902,6 +1902,7 @@
4+
dep_version = cpp.find_library('version')
5+
endif
6+
7+
+if host_machine.system() != 'darwin'
8+
dep_elf = dependency('libelf', required : false)
9+
if not with_platform_windows and not dep_elf.found()
10+
dep_elf = cc.find_library('elf', required : false)
11+
@@ -1911,6 +1912,7 @@
12+
elif with_gallium_radeonsi
13+
error('Gallium driver radeonsi requires libelf')
14+
endif
15+
+endif
16+
17+
dep_valgrind = dependency('valgrind', required : get_option('valgrind'))
18+
if dep_valgrind.found()

0 commit comments

Comments
 (0)