MONGOCRYPT-688 remove RHEL 6.2 (#1196)

Author: kevinAlbs

.evergreen/config.yml

@@ -629,8 +629,6 @@ tasks:
 
 - name: upload-java # TODO(MONGOCRYPT-894) remove in favor of `upload-release` tasks.
   depends_on:
-    - variant: rhel-62-64-bit
-      name: build-and-test-and-upload
     - variant: rhel72-zseries-test
       name: build-and-test-and-upload
     - variant: rhel-71-ppc64el
@@ -648,8 +646,6 @@ tasks:
     - command: shell.exec
       params:
         script: mkdir all
-    - func: "download tarball"
-      vars: { variant_name: "rhel-62-64-bit" }
     - func: "download tarball"
       vars: { variant_name: "rhel72-zseries-test" }
     - func: "download tarball"
@@ -737,8 +733,6 @@ tasks:
       name: build-and-test-and-upload
     - variant: debian92
       name: build-and-test-and-upload
-    - variant: rhel-62-64-bit
-      name: build-and-test-and-upload
     - variant: rhel-70-64-bit
       name: build-and-test-and-upload
     - variant: rhel-71-ppc64el
@@ -816,8 +810,6 @@ tasks:
       vars: { variant_name: "debian10" }
     - func: "download tarball"
       vars: { variant_name: "debian92" }
-    - func: "download tarball"
-      vars: { variant_name: "rhel-62-64-bit" }
     - func: "download tarball"
       vars: { variant_name: "rhel-70-64-bit" }
     - func: "download tarball"
@@ -1690,16 +1682,6 @@ buildvariants:
   - name: publish-packages
     distros:
     - ubuntu2004-small
-- name: rhel-62-64-bit
-  display_name: "RHEL 6.2 64-bit"
-  run_on: rhel62-small
-  expansions:
-    compile_env: >-
-      LIBMONGOCRYPT_COMPILE_FLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
-      BUILD_TESTING=OFF
-  tasks:
-  - build-and-test-and-upload
-  - build-and-test-shared-bson
 - name: rhel-70-64-bit
   display_name: "RHEL 7.0 64-bit"
   run_on: rhel70-small

.evergreen/linker-tests.sh

@@ -39,9 +39,6 @@ common_cmake_args=(
 )
 
 run_chdir "$MONGOC_DIR" git apply --ignore-whitespace "$linker_tests_deps_root/bson_patches/libbson1.patch"
-# Apply patches to fix compile on RHEL 6.2. TODO: try to remove once RHEL 6.2 is dropped (MONGOCRYPT-688).
-run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-pragma.patch"
-run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/mongo-common-test-harness.patch"
 
 . "$(dirname "${BASH_SOURCE[0]}")/install-build-tools.sh"
 install_build_tools
@@ -61,9 +58,6 @@ echo "Make libbson1 ... done"
 echo "Prepare libbson2 ..."
 run_chdir "$MONGOC_DIR" git reset --hard
 run_chdir "$MONGOC_DIR" git apply --ignore-whitespace "$linker_tests_deps_root/bson_patches/libbson2.patch"
-# Apply patch to fix compile on RHEL 6.2. TODO: try to remove once RHEL 6.2 is dropped (MONGOCRYPT-688).
-run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-pragma.patch"
-run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/mongo-common-test-harness.patch"
 LIBBSON2_SRC_DIR="$MONGOC_DIR"
 echo "Prepare libbson2 ... done"
 

.evergreen/pkgconfig-tests.sh

@@ -25,9 +25,6 @@ common_cmake_args=(
     -D BUILD_TESTING="${BUILD_TESTING-TRUE}"
 )
 
-# Apply patches to fix compile on RHEL 6.2. TODO: try to remove once RHEL 6.2 is dropped (MONGOCRYPT-688).
-run_chdir "$mongoc_src_dir" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-pragma.patch"
-run_chdir "$mongoc_src_dir" git apply "$LIBMONGOCRYPT_DIR/etc/mongo-common-test-harness.patch"
 
 . "$(dirname "${BASH_SOURCE[0]}")/install-build-tools.sh"
 install_build_tools

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 <!-- TODO: add entries for next release -->
 
+### Removed
+- RHEL 6.2 builds. Use the `linux-x86_64-glibc_2_7-nocrypto` build instead as it has an equivalent glibc requirement.
+
 ## 1.19.2
 
 ### Added

cmake/FetchMongoC.cmake

@@ -15,11 +15,7 @@ include (Patch)
 make_patch_command (patch_command
     STRIP_COMPONENTS 1
     DIRECTORY "<SOURCE_DIR>"
-    DISABLED "${patch_disabled}"
-    PATCHES
-        ${PROJECT_SOURCE_DIR}/etc/libbson-remove-GCC-diagnostic-pragma.patch
-        ${PROJECT_SOURCE_DIR}/etc/mongo-common-test-harness.patch
-    )
+    DISABLED "${patch_disabled}")
 
 # Fetch the source archive for the requested tag from GitHub
 FetchContent_Declare (

cmake/Patch.cmake

@@ -14,7 +14,7 @@ find_program(PATCH_EXECUTABLE patch)
 ]]
 function(make_patch_command out)
     cmake_parse_arguments(PARSE_ARGV 1 patch "" "DIRECTORY;STRIP_COMPONENTS;DISABLED" "PATCHES")
-    if(patch_DISABLED)
+    if(patch_DISABLED OR NOT patch_PATCHES)
         # Use a placeholder "no-op" patch command.
         set(cmd "${CMAKE_COMMAND}" "-E" "true")
     elseif(GIT_EXECUTABLE)