From b21d667bdfb13df15f249896155f98f175a89657 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 8 Nov 2020 12:09:27 +0300
Subject: [PATCH 1/4] Fix compilation error.

---
 td/telegram/MessageContent.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/td/telegram/MessageContent.h b/td/telegram/MessageContent.h
index 65d19c517..b4a7105a7 100644
--- a/td/telegram/MessageContent.h
+++ b/td/telegram/MessageContent.h
@@ -32,6 +32,7 @@
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
 
+#include <functional>
 #include <utility>
 
 namespace td {

From f9a600c401ba20af7e07ee60e12b1de28dd2e14c Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 8 Nov 2020 14:00:36 +0300
Subject: [PATCH 2/4] Minor fixes.

---
 .gitattributes                   | 1 -
 td/telegram/MessageContent.h     | 1 -
 td/telegram/MessageContentType.h | 2 ++
 tdutils/td/utils/AtomicRead.h    | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 1aeb2b1a0..2d04f9b7e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,7 +13,6 @@
 *.cmake text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.md text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.in text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
-*.sky text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.html text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 
 *.java text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
diff --git a/td/telegram/MessageContent.h b/td/telegram/MessageContent.h
index b4a7105a7..65d19c517 100644
--- a/td/telegram/MessageContent.h
+++ b/td/telegram/MessageContent.h
@@ -32,7 +32,6 @@
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
 
-#include <functional>
 #include <utility>
 
 namespace td {
diff --git a/td/telegram/MessageContentType.h b/td/telegram/MessageContentType.h
index a01b9d3ea..d8dc3c507 100644
--- a/td/telegram/MessageContentType.h
+++ b/td/telegram/MessageContentType.h
@@ -9,6 +9,8 @@
 #include "td/utils/common.h"
 #include "td/utils/StringBuilder.h"
 
+#include <functional>
+
 namespace td {
 
 enum class MessageContentType : int32 {
diff --git a/tdutils/td/utils/AtomicRead.h b/tdutils/td/utils/AtomicRead.h
index f64691020..a6d5c6ad7 100644
--- a/tdutils/td/utils/AtomicRead.h
+++ b/tdutils/td/utils/AtomicRead.h
@@ -13,7 +13,6 @@
 #include <atomic>
 #include <cstring>
 #include <memory>
-#include <type_traits>
 
 namespace td {
 

From 7a0b88441a980171624f4727fd5f52d9db078730 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 8 Nov 2020 18:51:35 +0300
Subject: [PATCH 3/4] Add CentOS to build instructions generator.

---
 build.html | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/build.html b/build.html
index 3c4d5541e..be7789692 100644
--- a/build.html
+++ b/build.html
@@ -54,6 +54,8 @@ select.large { font-size: large; }
     <select id="linuxSelect" onchange="onOsChanged()" class="large">
       <option>Choose a Linux distro:</option>
       <option>Alpine</option>
+      <option>CentOS 7</option>
+      <option>CentOS 8</option>
       <option>Debian 8</option>
       <option>Debian 9</option>
       <option>Debian 10</option>
@@ -377,7 +379,7 @@ function onOptionsChanged() {
   document.getElementById('buildCommandsDiv').style.display = 'block';
 
   var use_clang = os_freebsd || os_openbsd;
-  if (os_linux && linux_distro !== 'Alpine') {
+  if (os_linux && linux_distro !== 'Alpine' && !linux_distro.includes('CentOS')) {
     document.getElementById('buildCompilerDiv').style.display = 'block';
     use_clang = document.getElementById('buildCompilerRadioClang').checked;
   } else {
@@ -588,7 +590,8 @@ function onOptionsChanged() {
 
   var commands = [];
 
-  var php = "php";
+  var php = 'php';
+  var cmake = 'cmake';
   if (os_mac) {
     commands.push('xcode-select --install');
     commands.push('/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"');
@@ -607,6 +610,24 @@ function onOptionsChanged() {
         }
         commands.push(sudo + 'apk add --update ' + packages);
         break;
+      case 'CentOS 7':
+      case 'CentOS 8':
+        commands.push(sudo + 'yum update -y');
+        var packages = 'gcc-c++ make git zlib-devel openssl-devel php';
+        if (linux_distro === 'CentOS 7') {
+          commands.push(sudo + 'yum install -y centos-release-scl-rh epel-release');
+          commands.push(sudo + 'yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++');
+          cmake = 'cmake3';
+          packages += ' gperf';
+        } else {
+          commands.push(sudo + 'dnf --enablerepo=PowerTools install gperf');
+        }
+        packages += ' ' + cmake;
+        if (target === 'JNI') {
+          packages += ' java-11-openjdk-devel';
+        }
+        commands.push(sudo + 'yum install -y ' + packages);
+        break;
       case 'Debian 8':
       case 'Debian 9':
       case 'Debian 10':
@@ -812,20 +833,22 @@ function onOptionsChanged() {
           }
         } else if (linux_distro === 'Ubuntu 14') {
           prefix = 'CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 ';
+        } else if (linux_distro === 'CentOS 7') {
+          prefix = 'CC=/opt/rh/devtoolset-9/root/usr/bin/gcc CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ ';
         }
       }
-      return prefix + 'cmake ' + options.join(' ') + ' ..';
+      return prefix + cmake + ' ' + options.join(' ') + ' ..';
     }
     commands.push(getCmakeInitCommand(cmake_init_options));
 
     if (low_memory) {
-      commands.push('cmake --build . --target prepare_cross_compiling');
+      commands.push(cmake + ' --build . --target prepare_cross_compiling');
       commands.push('cd ..');
       commands.push(php + ' SplitSource.php');
       commands.push('cd build');
     }
 
-    let build_command = 'cmake --build .';
+    let build_command = cmake + ' --build .';
     if (install_dir) {
       build_command += ' --target install';
     }
@@ -873,7 +896,7 @@ function onOptionsChanged() {
         commands.push(getCmakeInitCommand(cmake_init_options));
       }
 
-      build_command = 'cmake --build .';
+      build_command = cmake + ' --build .';
       if (jni_install_dir) {
         build_command += ' --target install';
       }

From 1d75237893c8a08d73ba95a7e76b8da517b8c1dc Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 8 Nov 2020 21:03:23 +0300
Subject: [PATCH 4/4] Don't export CXXFLAGS in build instructions generator.

---
 build.html | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/build.html b/build.html
index be7789692..2a2bab1c8 100644
--- a/build.html
+++ b/build.html
@@ -86,7 +86,7 @@ select.large { font-size: large; }
     <div id="buildCompilerDiv" class="hide">
       <span>Choose which compiler you want to use to build TDLib:</span><br>
       <label><input type="radio" id="buildCompilerRadioGcc" name="buildCompilerRadio" onchange="onOptionsChanged()" checked/>g++</label>
-      <label><input type="radio" id="buildCompilerRadioClang" name="buildCompilerRadio" onchange="onOptionsChanged()"/>clang++ (recommended)</label>
+      <label><input type="radio" id="buildCompilerRadioClang" name="buildCompilerRadio" onchange="onOptionsChanged()"/>clang (recommended)</label>
       <p></p>
     </div>
 
@@ -520,7 +520,7 @@ function onOptionsChanged() {
   }
   if (os_linux && linux_distro === 'Other') {
     var jdk = target === 'JNI' ? ', JDK ' : '';
-    var compiler = use_clang ? 'clang++ >= 3.4' : 'g++ >= 4.9.2';
+    var compiler = use_clang ? 'clang >= 3.4' : 'g++ >= 4.9.2';
     pre_text.push('Install Git, ' + compiler + ', make, CMake >= 3.0.2, OpenSSL-dev, zlib-dev, gperf, PHP' + jdk + ' using your package manager.');
   }
   if (os_linux && os.includes('Node.js')) {
@@ -765,34 +765,6 @@ function onOptionsChanged() {
     commands.push('mkdir build');
     commands.push('cd build');
 
-    if (!use_msvc) {
-      var c_flags = [];
-      var cxx_flags = [];
-
-      if (build_32bit) {
-        c_flags.push('-m32');
-        cxx_flags.push('-m32');
-      } else if (build_64bit) {
-        c_flags.push('-m64');
-        cxx_flags.push('-m64');
-      }
-
-      if (os_linux) {
-        if (use_clang) {
-          cxx_flags.push('-stdlib=libc++');
-        } else {
-          cxx_flags.push('');
-        }
-      }
-
-      if (c_flags.length) {
-        commands.push('export CFLAGS="' + c_flags.join(' ') + '"');
-      }
-      if (cxx_flags.length) {
-        commands.push('export CXXFLAGS="' + cxx_flags.join(' ') + '"');
-      }
-    }
-
     cmake_init_options = getBacicCmakeInitOptions();
     if (os_mac) {
       cmake_init_options.push('-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/');
@@ -824,7 +796,7 @@ function onOptionsChanged() {
       if (os_linux) {
         if (use_clang) {
           var clang_version_suffix = getClangVersionSuffix();
-          prefix = 'CC=/usr/bin/clang' + clang_version_suffix + ' CXX=/usr/bin/clang++' + clang_version_suffix + ' ';
+          prefix = 'CXXFLAGS="-stdlib=libc++" CC=/usr/bin/clang' + clang_version_suffix + ' CXX=/usr/bin/clang++' + clang_version_suffix + ' ';
           if (use_lto) {
             options.push('-DCMAKE_AR=/usr/bin/llvm-ar' + clang_version_suffix);
             options.push('-DCMAKE_NM=/usr/bin/llvm-nm' + clang_version_suffix);