@@ -68,13 +68,13 @@ def install_x86_support_libraries(gha_build=False):
68
68
packages = ['gcc-multilib' , 'g++-multilib' , 'libglib2.0-dev:i386' ,
69
69
'libsecret-1-dev:i386' , 'libpthread-stubs0-dev:i386' ,
70
70
'libssl-dev:i386' ]
71
- # if gha_build:
72
- # Workaround for GitHub runners, which have an incompatibility between the
73
- # 64-bit and 32-bit versions of the Ubuntu package libpcre2-8-0. Downgrade
74
- # the installed 64-bit version of the library to get around this issue.
75
- # This will presumably be fixed in a future Ubuntu update. (If you remove
76
- # it, remove the workaround further down this function as well.)
77
- # packages = ['--allow-downgrades'] + packages + ['libpcre2-8-0=10.34-7']
71
+ if gha_build :
72
+ # Workaround for GitHub runners, which have an incompatibility between the
73
+ # 64-bit and 32-bit versions of the Ubuntu package libpcre2-8-0. Downgrade
74
+ # the installed 64-bit version of the library to get around this issue.
75
+ # This will presumably be fixed in a future Ubuntu update. (If you remove
76
+ # it, remove the workaround further down this function as well.)
77
+ packages = ['--allow-downgrades' ] + packages + ['libpcre2-8-0=10.34-7' ]
78
78
79
79
# First check if these packages exist on the machine already
80
80
devnull = open (os .devnull , "w" )
@@ -87,15 +87,15 @@ def install_x86_support_libraries(gha_build=False):
87
87
utils .run_command (['apt' , 'update' ], as_root = True , check = True )
88
88
utils .run_command (['apt' , 'install' , '-V' , '-y' ] + packages , as_root = True , check = True )
89
89
90
- # if gha_build:
91
- # One more workaround: downgrading libpcre2-8-0 above may have uninstalled
92
- # libsecret, which is required for the Linux build. Force it to be
93
- # reinstalled, but do it as a separate command to ensure that held
94
- # packages aren't modified. (Once the workaround above is removed, this can
95
- # be removed as well.)
96
- # Note: "-f" = "fix" - let apt do what it needs to do to fix dependencies.
97
- # utils.run_command(['apt', 'install', '-f', '-V', '-y', 'libsecret-1-dev'],
98
- # as_root=True, check=True)
90
+ if gha_build :
91
+ # One more workaround: downgrading libpcre2-8-0 above may have uninstalled
92
+ # libsecret, which is required for the Linux build. Force it to be
93
+ # reinstalled, but do it as a separate command to ensure that held
94
+ # packages aren't modified. (Once the workaround above is removed, this can
95
+ # be removed as well.)
96
+ # Note: "-f" = "fix" - let apt do what it needs to do to fix dependencies.
97
+ utils .run_command (['apt' , 'install' , '-f' , '-V' , '-y' , 'libsecret-1-dev:i386 ' ],
98
+ as_root = True , check = True )
99
99
100
100
101
101
def _install_cpp_dependencies_with_vcpkg (arch , msvc_runtime_library , use_openssl = False ):
0 commit comments