From 8bbccf0b88bed8f211b1de4a7440843f70a13472 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Wed, 23 Nov 2022 10:55:33 +0100 Subject: git2: do not enforce configuration transition on deps In our packaging of git2, do not carry out a configuration transition that is visible to dependencies. While its dependencies, ssl and zlib, accept that TARGET_ARCH is defaulted to ARCH if unset and still return the same result, regardless which export targets are cached, we still should not enforce any configuration transition on dependencies as this has the potential to cause subtle conflicts. The implicit default of TARGET_ARCH to ARCH in zlib and ssl can stay, as those libraries do not depend on any other repositories. --- etc/import/TARGETS.git2 | 3 +-- etc/import/include/git2/TARGETS.git2 | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/import/TARGETS.git2 b/etc/import/TARGETS.git2 index 69bbf9ce..dc3e8fc8 100644 --- a/etc/import/TARGETS.git2 +++ b/etc/import/TARGETS.git2 @@ -94,7 +94,7 @@ , "config": { "type": "let*" , "bindings": - [ [ "TARGET_ARCH" + [ [ "check that architecture is set" , { "type": "var" , "name": "TARGET_ARCH" , "default": @@ -191,7 +191,6 @@ { "type": "env" , "vars": [ "OS" - , "TARGET_ARCH" , "USE_SYSTEM_LIBS" , "DEBUG_POOL" , "ENABLE_TRACE" diff --git a/etc/import/include/git2/TARGETS.git2 b/etc/import/include/git2/TARGETS.git2 index 29a5d269..84eb50c3 100644 --- a/etc/import/include/git2/TARGETS.git2 +++ b/etc/import/include/git2/TARGETS.git2 @@ -34,7 +34,11 @@ ] , [ "IS_32BIT" , { "type": "case" - , "expr": {"type": "var", "name": "TARGET_ARCH"} + , "expr": + { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } , "case": {"x86": true, "arm": true} } ] -- cgit v1.2.3