From c4b895b7606f908e2fe5b65ca3fc48305215c926 Mon Sep 17 00:00:00 2001 From: Blady-Com Date: Mon, 18 Jul 2022 13:19:58 +0200 Subject: [PATCH] More macOS support for simple_components (#565) --- index/li/libgnutls/libgnutls-external.toml | 5 +++++ index/si/simple_components/simple_components-4.42.0.toml | 2 +- index/un/unixodbc/unixodbc-external.toml | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/index/li/libgnutls/libgnutls-external.toml b/index/li/libgnutls/libgnutls-external.toml index 6a0982d2..923c7a81 100644 --- a/index/li/libgnutls/libgnutls-external.toml +++ b/index/li/libgnutls/libgnutls-external.toml @@ -9,3 +9,8 @@ kind = "system" [external.origin."case(distribution)"] "..." = [] "debian|ubuntu" = ["libgnutls28-dev"] + +[[external]] +kind = "version-output" +version-command = [ "pkg-config", "--modversion", "gnutls" ] +version-regexp = "([\\d\\.]+)" diff --git a/index/si/simple_components/simple_components-4.42.0.toml b/index/si/simple_components/simple_components-4.42.0.toml index 3b8d845a..a0219c68 100644 --- a/index/si/simple_components/simple_components-4.42.0.toml +++ b/index/si/simple_components/simple_components-4.42.0.toml @@ -10,7 +10,7 @@ maintainers-logins = ["mosteo"] project-files = ["components.gpr", "components-connections_server.gpr", "components-connections_server-elv_max_cube.gpr", "components-connections_server-http_server.gpr", "components-connections_server-http_server-sqlite_browser.gpr", "components-connections_server-modbus.gpr", "components-connections_server-mqtt.gpr", "components-connections_server-secure.gpr", "components-connections_server-smtp.gpr", "components-gnutls.gpr", "components-ntp.gpr", "components-odbc.gpr", "components-sqlite.gpr", "strings_edit.gpr", "tables.gpr"] [[depends-on]] -gnat = "/=2021 & <11" +gnat = "<2020 & (<11 | >2000)" libgnutls = "^3.5.8" unixODBC = "^2.3" diff --git a/index/un/unixodbc/unixodbc-external.toml b/index/un/unixodbc/unixodbc-external.toml index ae0eb4be..b19c1c3b 100644 --- a/index/un/unixodbc/unixodbc-external.toml +++ b/index/un/unixodbc/unixodbc-external.toml @@ -8,3 +8,8 @@ maintainers-logins = ["mosteo"] [[external]] kind = "system" origin = ["unixodbc-dev"] + +[[external]] +kind = "version-output" +version-command = [ "odbc_config", "--version" ] +version-regexp = "([\\d\\.]+)"