KERNEL32.dll position has moved in deps dump output, and avoid patching the CoreFoundation change for linux.

Author: kannanjgithub

buildscripts/make_dependencies.sh

@@ -34,7 +34,10 @@ else
     curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz
     curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz
     rmdir "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
-    patch abseil-cpp-$ABSL_VERSION/absl/time/CMakeLists.txt $BUILDSCRIPTS_DIR/absl_time_CMakeLists.patch
+    os_name=$(uname -s)
+    if [[ "$os_name" == "Darwin" ]]; then
+      patch abseil-cpp-$ABSL_VERSION/absl/time/CMakeLists.txt $BUILDSCRIPTS_DIR/absl_time_CMakeLists.patch
+    fi
     mv "abseil-cpp-$ABSL_VERSION" "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
   fi
   # the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first

compiler/build.gradle

@@ -110,9 +110,9 @@ model {
                 } else if (osdetector.os == "windows") {
                     linker.args "-static", "-lprotoc", "-lprotobuf", "-static-libgcc", "-static-libstdc++",
                             "-s"
-		  } else if (osdetector.arch == "ppcle_64") {
-		      linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-Wl,-Bdynamic", "-lpthread", "-s"
-		  } else {
+          		  } else if (osdetector.arch == "ppcle_64") {
+	   	              linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-Wl,-Bdynamic", "-lpthread", "-s"
+          		  } else {
                     // Link protoc, protobuf, libgcc and libstdc++ statically.
                     // Link other (system) libraries dynamically.
                     // Clang under OSX doesn't support these options.
@@ -245,7 +245,7 @@ def checkArtifacts = tasks.register("checkArtifacts") {
                 throw new GradleException("dumpbin exited with " + ret.exitValue)
             }
             def dlls = os.toString() =~ /Image has the following dependencies:\s+(.*)\s+Summary/
-            if (dlls[0][1] != "KERNEL32.dll") {
+            if (dlls[0][2] != "KERNEL32.dll") {
                 throw new Exception("unexpected dll deps: " + dlls[0][1]);
             }
             os.reset()