summaryrefslogtreecommitdiff
path: root/.pick_status.json
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2019-12-06 17:25:58 +1100
committerDylan Baker <dylan.c.baker@intel.com>2020-09-01 13:53:31 -0700
commit43bd915ff5612e8d212fa355519bb04a6d3be6ad (patch)
treea8cb95ec3087f82c54feb4697adb15069c5f4dce /.pick_status.json
parentdb2fa8208c8a9eefad29ed6e20cddd32d8382621 (diff)
meson: conditionally include -ldl in gbm pkg-config file
Follow libGL and only include -ldl in gbm pkg-config file if libdl was actually found. Many systems have these functions in libc and don't have libdl. Fixes: 816bf7d1644 ("meson: build gbm") Signed-off-by: Jonathan Gray <jsg@jsg.id.au> Reviewed-by: Eric Engestrom <eric@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630> (cherry picked from commit 0398caa97fa6ab9a0eac29dfca38b3fceb2cc026)
Diffstat (limited to '.pick_status.json')
-rw-r--r--.pick_status.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index b424d5c3bf1..6b9cdaf2946 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -904,7 +904,7 @@
"description": "meson: conditionally include -ldl in gbm pkg-config file",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "816bf7d1644b9b14df253c5d54f595514aa34703"
},