configure: Only clone softfloat-3 repositories if TCG is enabled

[PATCH] configure: Only clone softfloat-3 repositories if TCG is enabled

Posted by Philippe Mathieu-Daudé 4 years, 9 months ago

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 configure | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 5877a6b2bfe..e0e02623e3e 100755
--- a/configure
+++ b/configure
@@ -257,8 +257,6 @@ if test -e "$source_path/.git"
 then
     git_submodules_action="update"
     git_submodules="ui/keycodemapdb"
-    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
-    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
 else
     git_submodules_action="ignore"
     git_submodules=""
@@ -2277,6 +2275,11 @@ if test "$solaris" = "yes" ; then
   fi
 fi
 
+if test "$tcg" = "enabled"; then
+    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
+    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
+fi
+
 if test -z "${target_list+xxx}" ; then
     default_targets=yes
     for target in $default_target_list; do
-- 
2.26.3

Re: [PATCH] configure: Only clone softfloat-3 repositories if TCG is enabled

Posted by Thomas Huth 4 years, 9 months ago

On 12/05/2021 06.58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   configure | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index 5877a6b2bfe..e0e02623e3e 100755
> --- a/configure
> +++ b/configure
> @@ -257,8 +257,6 @@ if test -e "$source_path/.git"
>   then
>       git_submodules_action="update"
>       git_submodules="ui/keycodemapdb"
> -    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
> -    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
>   else
>       git_submodules_action="ignore"
>       git_submodules=""
> @@ -2277,6 +2275,11 @@ if test "$solaris" = "yes" ; then
>     fi
>   fi
>   
> +if test "$tcg" = "enabled"; then

Shouldn't there be a check here, too, whether git submodules are enabled at 
all or not?

  Thomas


> +    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
> +    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
> +fi
> +
>   if test -z "${target_list+xxx}" ; then
>       default_targets=yes
>       for target in $default_target_list; do
>

Re: [PATCH] configure: Only clone softfloat-3 repositories if TCG is enabled

Posted by Philippe Mathieu-Daudé 4 years, 9 months ago

On 5/12/21 7:12 AM, Thomas Huth wrote:
> On 12/05/2021 06.58, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>   configure | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 5877a6b2bfe..e0e02623e3e 100755
>> --- a/configure
>> +++ b/configure
>> @@ -257,8 +257,6 @@ if test -e "$source_path/.git"
>>   then
>>       git_submodules_action="update"
>>       git_submodules="ui/keycodemapdb"
>> -    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
>> -    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
>>   else
>>       git_submodules_action="ignore"
>>       git_submodules=""
>> @@ -2277,6 +2275,11 @@ if test "$solaris" = "yes" ; then
>>     fi
>>   fi
>>   +if test "$tcg" = "enabled"; then
> 
> Shouldn't there be a check here, too, whether git submodules are enabled
> at all or not?

IIUC this check is done later (see $git_submodules_action):

5487 if !(GIT="$git" "$source_path/scripts/git-submodule.sh"
"$git_submodules_action" "$git_submodules"); then
5488     exit 1
5489 fi

> 
>  Thomas
> 
> 
>> +    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
>> +    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
>> +fi
>> +
>>   if test -z "${target_list+xxx}" ; then
>>       default_targets=yes
>>       for target in $default_target_list; do
>>
>

Re: [PATCH] configure: Only clone softfloat-3 repositories if TCG is enabled

Posted by Paolo Bonzini 4 years, 9 months ago

On 12/05/21 06:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   configure | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index 5877a6b2bfe..e0e02623e3e 100755
> --- a/configure
> +++ b/configure
> @@ -257,8 +257,6 @@ if test -e "$source_path/.git"
>   then
>       git_submodules_action="update"
>       git_submodules="ui/keycodemapdb"
> -    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
> -    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
>   else
>       git_submodules_action="ignore"
>       git_submodules=""
> @@ -2277,6 +2275,11 @@ if test "$solaris" = "yes" ; then
>     fi
>   fi
>   
> +if test "$tcg" = "enabled"; then
> +    git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
> +    git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
> +fi
> +
>   if test -z "${target_list+xxx}" ; then
>       default_targets=yes
>       for target in $default_target_list; do
> 

Queued, thanks.

Paolo