Fix toolchain selection and packages on linux x86 (#1133)

* Fix toolchain selection on linux.

* Add path to 32-bit packages to pkgconfig environment variable.

* Add extra libsecret package.

* Remove conflicting packages

* Remove and add at the same time.

* Add a check after installing dependencies to verify they installed.

* Write package config path to temp toolchain file.

* Add readme.

Author: jonsimantov

cmake/toolchains/linux_32.cmake

@@ -18,3 +18,4 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 set(CMAKE_LIBRARY_PATH "/usr/lib/i386-linux-gnu")
 set(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} "/usr/include/i386-linux-gnu")
+set(ENV{PKG_CONFIG_PATH} "/usr/lib/i386-linux-gnu/pkgconfig:$ENV{PKG_CONFIG_PATH}")

release_build_files/readme.md

@@ -634,6 +634,10 @@ workflow use only during the development of your app, not for publicly shipping
 code.
 
 ## Release Notes
+### Upcoming Release
+-   Changes
+    - General (Desktop): Linux x86 libraries have been fixed.
+
 ### 10.1.0
 -   Changes
     - General (Android): Update to Firebase Android BoM version 31.0.2.

scripts/gha/build_desktop.py

@@ -171,7 +171,11 @@ def cmake_configure(build_dir, arch, msvc_runtime_library='static', linux_abi='l
     # workaround, absl doesn't build without tests enabled
     cmd.append('-DBUILD_TESTING=off')
 
-  if not disable_vcpkg:
+  if disable_vcpkg:
+    if utils.is_linux_os() and arch == 'x86':
+      toolchain_file_path = os.path.join(os.getcwd(), 'cmake', 'toolchains', 'linux_32.cmake')
+      cmd.append('-DCMAKE_TOOLCHAIN_FILE={0}'.format(toolchain_file_path))
+  else: # not disable_vcpkg - therefore vcpkg is enabled
     if utils.is_linux_os() and arch == 'x86':
       # Use a separate cmake toolchain for cross compiling linux x86 builds
       vcpkg_toolchain_file_path = os.path.join(os.getcwd(), 'external', 'vcpkg',

scripts/gha/build_testapps.py

@@ -277,7 +277,8 @@ def main(argv):
         'set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")\n',
         'set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")\n',
         'set(CMAKE_LIBRARY_PATH "/usr/lib/i386-linux-gnu")\n',
-        'set(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} "/usr/include/i386-linux-gnu")\n'])
+        'set(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} "/usr/include/i386-linux-gnu")\n',
+        'set(ENV{PKG_CONFIG_PATH} "/usr/lib/i386-linux-gnu/pkgconfig:$ENV{PKG_CONFIG_PATH}")'])
       temp_toolchain_file.flush()
       # Leave the file open, as it will be deleted on close, i.e. when this script exits.
       # (On Linux, the file can be opened a second time by cmake while still open by

scripts/gha/utils.py

@@ -231,16 +231,33 @@ def install_x86_support_libraries(gha_build=False):
   if is_linux_os():
     packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386',
                 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386',
-                'libssl-dev:i386']
+                'libssl-dev:i386', 'libsecret-1-0:i386']
+    remove_packages = []
 
     # First check if these packages exist on the machine already
     with open(os.devnull, "w") as devnull:
-      process = subprocess.run(["dpkg", "-s"] + packages, stdout=devnull, stderr=subprocess.STDOUT)
+      process = subprocess.run(["dpkg", "-s"] + packages, stdout=devnull,
+                               stderr=subprocess.STDOUT)
 
     if process.returncode != 0:
-      # This implies not all of the required packages are already installed on user's machine
-      # Install them.
-      run_command(['dpkg', '--add-architecture', 'i386'], as_root=True, check=True)
+      # This implies not all of the required packages are already installed on
+      # user's machine. Install them.
+      run_command(['dpkg', '--add-architecture', 'i386'], as_root=True,
+                  check=True)
       run_command(['apt', 'update'], as_root=True, check=True)
       run_command(['apt', 'install', 'aptitude'], as_root=True, check=True)
-      run_command(['aptitude', 'install', '-V', '-y'] + packages, as_root=True, check=True)
+      if gha_build:
+        # Remove libpcre to prevent package conflicts.
+        # Only remove packages on GitHub runners.
+        remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64',
+                           'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64']
+      # Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-'
+      # in the package list.
+      run_command(['aptitude', 'install', '-V', '-y'] + packages +
+                  ['%s-' % pkg for pkg in remove_packages], as_root=True, check=True)
+
+      # Check if the packages were installed
+      with open(os.devnull, "w") as devnull:
+        subprocess.run(["dpkg", "-s"] + packages, stdout=devnull, stderr=subprocess.STDOUT,
+                       check=True)
+