boost: Fix rootfile for x86_64

Message ID 20220606170414.4066636-1-matthias.fischer@ipfire.org
State Accepted
Commit b8939e48831fa18bea1360b6b332c5338ac310db
Headers
Series boost: Fix rootfile for x86_64 |

Commit Message

Matthias Fischer June 6, 2022, 5:04 p.m. UTC
  Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/common/x86_64/boost | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
  

Comments

Peter Müller June 7, 2022, 6:29 a.m. UTC | #1
Thank you. :-)

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
>  config/rootfiles/common/x86_64/boost | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
> index 357dc2d1d..fe77e6f8c 100644
> --- a/config/rootfiles/common/x86_64/boost
> +++ b/config/rootfiles/common/x86_64/boost
> @@ -16096,8 +16096,8 @@
>  #usr/lib/cmake/boost_python-1.76.0
>  #usr/lib/cmake/boost_python-1.76.0/boost_python-config-version.cmake
>  #usr/lib/cmake/boost_python-1.76.0/boost_python-config.cmake
> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.8.cmake
> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.8.cmake
> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.10.cmake
> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.10.cmake
>  #usr/lib/cmake/boost_random-1.76.0
>  #usr/lib/cmake/boost_random-1.76.0/boost_random-config-version.cmake
>  #usr/lib/cmake/boost_random-1.76.0/boost_random-config.cmake
> @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-x64.so.1.76.0
>  usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0
>  #usr/lib/libboost_prg_exec_monitor-x64.so
>  usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0
> -#usr/lib/libboost_python38-mt-x64.so
> -usr/lib/libboost_python38-mt-x64.so.1.76.0
> -#usr/lib/libboost_python38-x64.so
> -usr/lib/libboost_python38-x64.so.1.76.0
> +#usr/lib/libboost_python310-mt-x64.so
> +usr/lib/libboost_python310-mt-x64.so.1.76.0
> +#usr/lib/libboost_python310-x64.so
> +usr/lib/libboost_python310-x64.so.1.76.0
>  #usr/lib/libboost_random-mt-x64.so
>  usr/lib/libboost_random-mt-x64.so.1.76.0
>  #usr/lib/libboost_random-x64.so
  
Adolf Belka June 7, 2022, 11:12 a.m. UTC | #2
Interesting.
This is the same boost patch that I submitted about a month ago but 
didn't work in the IPFire build system, although it did in my personal 
IPFire build.

Now I saw that the nightlies were failing due to the same boost rootfile 
issue that I was seeing on my system and that the merging of the boost 
rootfile change now causes the nightly build to work again.

What I don't understand is why I saw the boost rootfile problem on my 
build but it wasn't seen on the IPFire build system till now.

Still major thing is that it looks to be working and has been 
successfully merged.

Regards,
Adolf.

On 07/06/2022 08:29, Peter Müller wrote:
> Thank you. :-)
>
> Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
>
>> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
>> ---
>>   config/rootfiles/common/x86_64/boost | 12 ++++++------
>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
>> index 357dc2d1d..fe77e6f8c 100644
>> --- a/config/rootfiles/common/x86_64/boost
>> +++ b/config/rootfiles/common/x86_64/boost
>> @@ -16096,8 +16096,8 @@
>>   #usr/lib/cmake/boost_python-1.76.0
>>   #usr/lib/cmake/boost_python-1.76.0/boost_python-config-version.cmake
>>   #usr/lib/cmake/boost_python-1.76.0/boost_python-config.cmake
>> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.8.cmake
>> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.8.cmake
>> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.10.cmake
>> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.10.cmake
>>   #usr/lib/cmake/boost_random-1.76.0
>>   #usr/lib/cmake/boost_random-1.76.0/boost_random-config-version.cmake
>>   #usr/lib/cmake/boost_random-1.76.0/boost_random-config.cmake
>> @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-x64.so.1.76.0
>>   usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0
>>   #usr/lib/libboost_prg_exec_monitor-x64.so
>>   usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0
>> -#usr/lib/libboost_python38-mt-x64.so
>> -usr/lib/libboost_python38-mt-x64.so.1.76.0
>> -#usr/lib/libboost_python38-x64.so
>> -usr/lib/libboost_python38-x64.so.1.76.0
>> +#usr/lib/libboost_python310-mt-x64.so
>> +usr/lib/libboost_python310-mt-x64.so.1.76.0
>> +#usr/lib/libboost_python310-x64.so
>> +usr/lib/libboost_python310-x64.so.1.76.0
>>   #usr/lib/libboost_random-mt-x64.so
>>   usr/lib/libboost_random-mt-x64.so.1.76.0
>>   #usr/lib/libboost_random-x64.so
  
Matthias Fischer June 7, 2022, 3:55 p.m. UTC | #3
Hi,

I'm a bit puzzled, too...

And I must confess that I hadn't your patch dated 4.5.2022 patch in
mind. I had to search for it after I read your mail.

I just thought: "If you need it - you can have it..." ;-)

Best,
Matthias

On 07.06.2022 13:12, Adolf Belka wrote:
> Interesting.
> This is the same boost patch that I submitted about a month ago but 
> didn't work in the IPFire build system, although it did in my personal 
> IPFire build.
> 
> Now I saw that the nightlies were failing due to the same boost rootfile 
> issue that I was seeing on my system and that the merging of the boost 
> rootfile change now causes the nightly build to work again.
> 
> What I don't understand is why I saw the boost rootfile problem on my 
> build but it wasn't seen on the IPFire build system till now.
> 
> Still major thing is that it looks to be working and has been 
> successfully merged.
> 
> Regards,
> Adolf.
> 
> On 07/06/2022 08:29, Peter Müller wrote:
>> Thank you. :-)
>>
>> Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
>>
>>> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
>>> ---
>>>   config/rootfiles/common/x86_64/boost | 12 ++++++------
>>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
>>> index 357dc2d1d..fe77e6f8c 100644
>>> --- a/config/rootfiles/common/x86_64/boost
>>> +++ b/config/rootfiles/common/x86_64/boost
>>> @@ -16096,8 +16096,8 @@
>>>   #usr/lib/cmake/boost_python-1.76.0
>>>   #usr/lib/cmake/boost_python-1.76.0/boost_python-config-version.cmake
>>>   #usr/lib/cmake/boost_python-1.76.0/boost_python-config.cmake
>>> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.8.cmake
>>> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.8.cmake
>>> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.10.cmake
>>> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.10.cmake
>>>   #usr/lib/cmake/boost_random-1.76.0
>>>   #usr/lib/cmake/boost_random-1.76.0/boost_random-config-version.cmake
>>>   #usr/lib/cmake/boost_random-1.76.0/boost_random-config.cmake
>>> @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-x64.so.1.76.0
>>>   usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0
>>>   #usr/lib/libboost_prg_exec_monitor-x64.so
>>>   usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0
>>> -#usr/lib/libboost_python38-mt-x64.so
>>> -usr/lib/libboost_python38-mt-x64.so.1.76.0
>>> -#usr/lib/libboost_python38-x64.so
>>> -usr/lib/libboost_python38-x64.so.1.76.0
>>> +#usr/lib/libboost_python310-mt-x64.so
>>> +usr/lib/libboost_python310-mt-x64.so.1.76.0
>>> +#usr/lib/libboost_python310-x64.so
>>> +usr/lib/libboost_python310-x64.so.1.76.0
>>>   #usr/lib/libboost_random-mt-x64.so
>>>   usr/lib/libboost_random-mt-x64.so.1.76.0
>>>   #usr/lib/libboost_random-x64.so
>
  
Peter Müller June 7, 2022, 4:39 p.m. UTC | #4
Hello *,

my only clue on that front would be the GCC update we've had in next the
other day. That requires an updated toolchain, I believe, hence a fresh ccache.

Perhaps it has got something to do with that, but that's just a wild stab in
the dark as well. Anyway, it's just "next", so its ugly, but nothing to have
headaches on. I am at it and try to work this out.

Thanks, and best regards,
Peter Müller


> Hi,
> 
> I'm a bit puzzled, too...
> 
> And I must confess that I hadn't your patch dated 4.5.2022 patch in
> mind. I had to search for it after I read your mail.
> 
> I just thought: "If you need it - you can have it..." ;-)
> 
> Best,
> Matthias
> 
> On 07.06.2022 13:12, Adolf Belka wrote:
>> Interesting.
>> This is the same boost patch that I submitted about a month ago but 
>> didn't work in the IPFire build system, although it did in my personal 
>> IPFire build.
>>
>> Now I saw that the nightlies were failing due to the same boost rootfile 
>> issue that I was seeing on my system and that the merging of the boost 
>> rootfile change now causes the nightly build to work again.
>>
>> What I don't understand is why I saw the boost rootfile problem on my 
>> build but it wasn't seen on the IPFire build system till now.
>>
>> Still major thing is that it looks to be working and has been 
>> successfully merged.
>>
>> Regards,
>> Adolf.
>>
>> On 07/06/2022 08:29, Peter Müller wrote:
>>> Thank you. :-)
>>>
>>> Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
>>>
>>>> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
>>>> ---
>>>>   config/rootfiles/common/x86_64/boost | 12 ++++++------
>>>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
>>>> index 357dc2d1d..fe77e6f8c 100644
>>>> --- a/config/rootfiles/common/x86_64/boost
>>>> +++ b/config/rootfiles/common/x86_64/boost
>>>> @@ -16096,8 +16096,8 @@
>>>>   #usr/lib/cmake/boost_python-1.76.0
>>>>   #usr/lib/cmake/boost_python-1.76.0/boost_python-config-version.cmake
>>>>   #usr/lib/cmake/boost_python-1.76.0/boost_python-config.cmake
>>>> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.8.cmake
>>>> -#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.8.cmake
>>>> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.10.cmake
>>>> +#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.10.cmake
>>>>   #usr/lib/cmake/boost_random-1.76.0
>>>>   #usr/lib/cmake/boost_random-1.76.0/boost_random-config-version.cmake
>>>>   #usr/lib/cmake/boost_random-1.76.0/boost_random-config.cmake
>>>> @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-x64.so.1.76.0
>>>>   usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0
>>>>   #usr/lib/libboost_prg_exec_monitor-x64.so
>>>>   usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0
>>>> -#usr/lib/libboost_python38-mt-x64.so
>>>> -usr/lib/libboost_python38-mt-x64.so.1.76.0
>>>> -#usr/lib/libboost_python38-x64.so
>>>> -usr/lib/libboost_python38-x64.so.1.76.0
>>>> +#usr/lib/libboost_python310-mt-x64.so
>>>> +usr/lib/libboost_python310-mt-x64.so.1.76.0
>>>> +#usr/lib/libboost_python310-x64.so
>>>> +usr/lib/libboost_python310-x64.so.1.76.0
>>>>   #usr/lib/libboost_random-mt-x64.so
>>>>   usr/lib/libboost_random-mt-x64.so.1.76.0
>>>>   #usr/lib/libboost_random-x64.so
>>
>
  

Patch

diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
index 357dc2d1d..fe77e6f8c 100644
--- a/config/rootfiles/common/x86_64/boost
+++ b/config/rootfiles/common/x86_64/boost
@@ -16096,8 +16096,8 @@ 
 #usr/lib/cmake/boost_python-1.76.0
 #usr/lib/cmake/boost_python-1.76.0/boost_python-config-version.cmake
 #usr/lib/cmake/boost_python-1.76.0/boost_python-config.cmake
-#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.8.cmake
-#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.8.cmake
+#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-mt-x64-shared-py3.10.cmake
+#usr/lib/cmake/boost_python-1.76.0/libboost_python-variant-x64-shared-py3.10.cmake
 #usr/lib/cmake/boost_random-1.76.0
 #usr/lib/cmake/boost_random-1.76.0/boost_random-config-version.cmake
 #usr/lib/cmake/boost_random-1.76.0/boost_random-config.cmake
@@ -16250,10 +16250,10 @@  usr/lib/libboost_nowide-x64.so.1.76.0
 usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0
 #usr/lib/libboost_prg_exec_monitor-x64.so
 usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0
-#usr/lib/libboost_python38-mt-x64.so
-usr/lib/libboost_python38-mt-x64.so.1.76.0
-#usr/lib/libboost_python38-x64.so
-usr/lib/libboost_python38-x64.so.1.76.0
+#usr/lib/libboost_python310-mt-x64.so
+usr/lib/libboost_python310-mt-x64.so.1.76.0
+#usr/lib/libboost_python310-x64.so
+usr/lib/libboost_python310-x64.so.1.76.0
 #usr/lib/libboost_random-mt-x64.so
 usr/lib/libboost_random-mt-x64.so.1.76.0
 #usr/lib/libboost_random-x64.so