From acc92e66671ea4080bff74beeeb2bbe94e7dcffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Fri, 4 Apr 2025 19:05:33 +0200 Subject: [PATCH 1/2] Fix `libgc` pkg-config name for version discovery --- src/gc/boehm.cr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gc/boehm.cr b/src/gc/boehm.cr index 3dc104dcb708..86390e51f060 100644 --- a/src/gc/boehm.cr +++ b/src/gc/boehm.cr @@ -50,7 +50,8 @@ require "crystal/tracing" {% end %} lib LibGC {% unless flag?(:win32) %} - VERSION = {{ `pkg-config bdw-gc --silence-errors --modversion || printf "0.0.0"`.chomp.stringify }} + {% pkg_config_name = ((ann = LibGC.annotations.find(&.["pkg_config"])) && ann["pkg_config"]) || ((ann = LibGC.annotations.find(&.[0])) && ann[0]) %} + VERSION = {{ `pkg-config #{pkg_config_name} --silence-errors --modversion || printf "0.0.0"`.chomp.stringify }} {% end %} alias Int = LibC::Int From 4505040050f0030463e307729fdf3a1dec279220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Fri, 4 Apr 2025 19:32:29 +0200 Subject: [PATCH 2/2] Update src/gc/boehm.cr Co-authored-by: Quinton Miller --- src/gc/boehm.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gc/boehm.cr b/src/gc/boehm.cr index 86390e51f060..485408f13b78 100644 --- a/src/gc/boehm.cr +++ b/src/gc/boehm.cr @@ -50,7 +50,7 @@ require "crystal/tracing" {% end %} lib LibGC {% unless flag?(:win32) %} - {% pkg_config_name = ((ann = LibGC.annotations.find(&.["pkg_config"])) && ann["pkg_config"]) || ((ann = LibGC.annotations.find(&.[0])) && ann[0]) %} + {% pkg_config_name = ((ann = LibGC.annotations(Link).find(&.["pkg_config"])) && ann["pkg_config"]) || ((ann = LibGC.annotations(Link).find(&.[0])) && ann[0]) %} VERSION = {{ `pkg-config #{pkg_config_name} --silence-errors --modversion || printf "0.0.0"`.chomp.stringify }} {% end %}