From: Peter Müller Date: Thu, 5 May 2022 21:16:45 +0000 (+0000) Subject: Revert "boost: Fix rootfile entries that referred to python3.8 instead of 3.10" X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=568215c84bb52ad09d7df43492eb61d99e343ac3;p=people%2Fms%2Fipfire-2.x.git Revert "boost: Fix rootfile entries that referred to python3.8 instead of 3.10" This reverts commit 05a1fe1362b633b82b696a88801bb29fb1070872. For some reason, the rootfile changes introduced with this patch break the build, as they do not seem to be present. Needs further investigation. --- diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost index 015dc1458d..49ff120ab2 100644 --- a/config/rootfiles/common/aarch64/boost +++ b/config/rootfiles/common/aarch64/boost @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-a64.so.1.76.0 usr/lib/libboost_prg_exec_monitor-mt-a64.so.1.76.0 #usr/lib/libboost_prg_exec_monitor-a64.so usr/lib/libboost_prg_exec_monitor-a64.so.1.76.0 -#usr/lib/libboost_python310-mt-a64.so -usr/lib/libboost_python310-mt-a64.so.1.76.0 -#usr/lib/libboost_python310-a64.so -usr/lib/libboost_python310-a64.so.1.76.0 +#usr/lib/libboost_python38-mt-a64.so +usr/lib/libboost_python38-mt-a64.so.1.76.0 +#usr/lib/libboost_python38-a64.so +usr/lib/libboost_python38-a64.so.1.76.0 #usr/lib/libboost_random-mt-a64.so usr/lib/libboost_random-mt-a64.so.1.76.0 #usr/lib/libboost_random-a64.so diff --git a/config/rootfiles/common/armv6l/boost b/config/rootfiles/common/armv6l/boost index 79e9ed3d7b..80cc4063a5 100644 --- a/config/rootfiles/common/armv6l/boost +++ b/config/rootfiles/common/armv6l/boost @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-mt-a32.so.1.76.0 usr/lib/libboost_prg_exec_monitor-a32.so.1.76.0 #usr/lib/libboost_prg_exec_monitor-mt-a32.so usr/lib/libboost_prg_exec_monitor-mt-a32.so.1.76.0 -#usr/lib/libboost_python310-a32.so -usr/lib/libboost_python310-a32.so.1.76.0 -#usr/lib/libboost_python310-mt-a32.so -usr/lib/libboost_python310-mt-a32.so.1.76.0 +#usr/lib/libboost_python38-a32.so +usr/lib/libboost_python38-a32.so.1.76.0 +#usr/lib/libboost_python38-mt-a32.so +usr/lib/libboost_python38-mt-a32.so.1.76.0 #usr/lib/libboost_random-a32.so usr/lib/libboost_random-a32.so.1.76.0 #usr/lib/libboost_random-mt-a32.so diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost index 77eef1d0b5..357dc2d1d2 100644 --- a/config/rootfiles/common/x86_64/boost +++ b/config/rootfiles/common/x86_64/boost @@ -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_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_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_random-mt-x64.so usr/lib/libboost_random-mt-x64.so.1.76.0 #usr/lib/libboost_random-x64.so