From b004af1750a6b9b3e3f416f75cae8f576318584d Mon Sep 17 00:00:00 2001
From: Brian Stinson <brian@bstinson.com>
Date: Jun 26 2019 20:43:23 +0000
Subject: patch4 dotnet-2.1.504-1.el8


---

diff --git a/.gitignore b/.gitignore
index cb502ca..d46f0ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v2.1.11.tar.gz
+SOURCES/dotnet-v2.1.8.tar.gz
diff --git a/SOURCES/corefx-optflags-support.patch b/SOURCES/corefx-optflags-support.patch
index a445618..2d0c603 100644
--- a/SOURCES/corefx-optflags-support.patch
+++ b/SOURCES/corefx-optflags-support.patch
@@ -20,9 +20,9 @@ index f4a30ad6cb..f2db68402a 100644
  
 +
 +set (PREVIOUS_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+set (CMAKE_CXX_FLAGS "-D_GNU_SOURCE")
++set (CMAKE_CXX_FLAGS "")
 +set (PREVIOUS_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-+set (CMAKE_C_FLAGS "-D_GNU_SOURCE")
++set (CMAKE_C_FLAGS "")
 +
  # We compile with -Werror, so we need to make sure these code fragments compile without warnings.
  # Older CMake versions (3.8) do not assign the result of their tests, causing unused-value errors
diff --git a/SOURCES/corefx-rhel-runtime-ids.patch b/SOURCES/corefx-rhel-runtime-ids.patch
new file mode 100644
index 0000000..9895dcd
--- /dev/null
+++ b/SOURCES/corefx-rhel-runtime-ids.patch
@@ -0,0 +1,206 @@
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+index 7272b5de10..99fd8de923 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+@@ -4923,6 +4923,123 @@
+     "any",
+     "base"
+   ],
++  "rhel.8": [
++    "rhel.8",
++    "rhel",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rhel.8-corert": [
++    "rhel.8-corert",
++    "rhel.8",
++    "rhel-corert",
++    "rhel",
++    "linux-corert",
++    "linux",
++    "unix-corert",
++    "unix",
++    "corert",
++    "any",
++    "base"
++  ],
++  "rhel.8-x64": [
++    "rhel.8-x64",
++    "rhel.8",
++    "rhel-x64",
++    "rhel",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rhel.8-x64-corert": [
++    "rhel.8-x64-corert",
++    "rhel.8-corert",
++    "rhel.8-x64",
++    "rhel.8",
++    "rhel-x64-corert",
++    "rhel-corert",
++    "rhel-x64",
++    "rhel",
++    "linux-x64-corert",
++    "linux-corert",
++    "linux-x64",
++    "linux",
++    "unix-x64-corert",
++    "unix-corert",
++    "unix-x64",
++    "unix",
++    "corert",
++    "any",
++    "base"
++  ],
++  "rhel.8.0": [
++    "rhel.8.0",
++    "rhel.8",
++    "rhel",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rhel.8.0-corert": [
++    "rhel.8.0-corert",
++    "rhel.8.0",
++    "rhel.8-corert",
++    "rhel.8",
++    "rhel-corert",
++    "rhel",
++    "linux-corert",
++    "linux",
++    "unix-corert",
++    "unix",
++    "corert",
++    "any",
++    "base"
++  ],
++  "rhel.8.0-x64": [
++    "rhel.8.0-x64",
++    "rhel.8.0",
++    "rhel.8-x64",
++    "rhel.8",
++    "rhel-x64",
++    "rhel",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rhel.8.0-x64-corert": [
++    "rhel.8.0-x64-corert",
++    "rhel.8.0-corert",
++    "rhel.8.0-x64",
++    "rhel.8.0",
++    "rhel.8-x64-corert",
++    "rhel.8-corert",
++    "rhel.8-x64",
++    "rhel.8",
++    "rhel-x64-corert",
++    "rhel-corert",
++    "rhel-x64",
++    "rhel",
++    "linux-x64-corert",
++    "linux-corert",
++    "linux-x64",
++    "linux",
++    "unix-x64-corert",
++    "unix-corert",
++    "unix-x64",
++    "unix",
++    "corert",
++    "any",
++    "base"
++  ],
+   "sles": [
+     "sles",
+     "linux",
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
+index e57332c62c..fc56341c7e 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
+@@ -1800,6 +1800,56 @@
+         "rhel.7.5-x64-corert"
+       ]
+     },
++    "rhel.8": {
++      "#import": [
++        "rhel"
++      ]
++    },
++    "rhel.8-corert": {
++      "#import": [
++        "rhel.8",
++        "rhel-corert"
++      ]
++    },
++    "rhel.8-x64": {
++      "#import": [
++        "rhel.8",
++        "rhel-x64"
++      ]
++    },
++    "rhel.8-x64-corert": {
++      "#import": [
++        "rhel.8-corert",
++        "rhel.8-x64",
++        "rhel.8",
++        "rhel-x64-corert"
++      ]
++    },
++    "rhel.8.0": {
++      "#import": [
++        "rhel.8"
++      ]
++    },
++    "rhel.8.0-corert": {
++      "#import": [
++        "rhel.8.0",
++        "rhel.8-corert"
++      ]
++    },
++    "rhel.8.0-x64": {
++      "#import": [
++        "rhel.8.0",
++        "rhel.8-x64"
++      ]
++    },
++    "rhel.8.0-x64-corert": {
++      "#import": [
++        "rhel.8.0-corert",
++        "rhel.8.0-x64",
++        "rhel.8.0",
++        "rhel.8-x64-corert"
++      ]
++    },
+     "sles": {
+       "#import": [
+         "linux"
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+index cc93f8bf91..21f6109824 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
++++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+@@ -103,6 +103,12 @@
+       <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
+     </RuntimeGroup>
+ 
++    <RuntimeGroup Include="rhel">
++      <Parent>linux</Parent>
++      <Architectures>x64</Architectures>
++      <Versions>8;8.0</Versions>
++    </RuntimeGroup>
++
+     <RuntimeGroup Include="sles">
+       <Parent>linux</Parent>
+       <Architectures>x64</Architectures>