Removed conflicting project variable settings

alire-project · May 30, 2024 · 8553883 · 8553883
1 parent cd81313
commit 8553883
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/index/gn/gnoga/gnoga-2.1.2.toml b/index/gn/gnoga/gnoga-2.1.2.toml
@@ -12,11 +12,6 @@ licenses = "GPL-3.0-only WITH GCC-exception-3.1"
 
 project-files = ["lib_gnoga.gpr"]
 
-[gpr-set-externals.'case(os)']
-linux   = { Target_OS = "Linux", PRJ_TARGET = "Linux" }
-windows = { Target_OS = "Windows", PRJ_TARGET = "Windows" }
-macos   = { Target_OS = "OSX", PRJ_TARGET = "OSX" }
-
 [[depends-on]]
 gnat = ">=2021 | (>=12 & <2000)"
 simple_components = "^4.62.0"

diff --git a/index/si/simple_components/simple_components-4.68.0.toml b/index/si/simple_components/simple_components-4.68.0.toml
@@ -21,13 +21,16 @@ Target_OS = ["Windows", "Windows_NT", "Linux", "UNIX", "OSX", "FreeBSD", "auto"]
 Tasking = ["Multiple", "Single"] # Default Multiple
 Traced_Objects = ["Off", "On"] # Default Off
 
-[gpr-set-externals]
-Target_OS = "auto"
-
+[gpr-set-externals."case(os)".freebsd]
+Target_OS = "FreeBSD"
 [gpr-set-externals."case(os)".linux]
-odbc = "unixODBC"
+Target_OS = "Linux"
+odbc      = "unixODBC"
+[gpr-set-externals."case(os)".macos]
+Target_OS = "OSX"
 [gpr-set-externals."case(os)".windows]
-odbc = "ODBC32"
+Target_OS = "Windows"
+odbc      = "ODBC32"
 
 [gpr-set-externals."case(word-size)".bits-32]
 arch = "i686"

diff --git a/index/un/unixodbc/unixodbc-external.toml b/index/un/unixodbc/unixodbc-external.toml
@@ -9,6 +9,7 @@ maintainers-logins = ["mosteo"]
 kind = "system"
 [external.origin."case(distribution)"]
 "debian|ubuntu" = ["unixodbc-dev"]
+"fedora" = ["unixODBC-devel"]
 "homebrew" = ["unixodbc"]
 "macports" = ["unixodbc"]