bpo-42692: fix __builtin_available check on older compilers (GH-23873)

A compiler that doesn't define `__has_builtin` will error out when it is
used on the same line as the check for it.

Automerge-Triggered-By: GH:ronaldoussoren

Lib/test/test_curses.py

@@ -85,7 +85,7 @@ class TestCurses(unittest.TestCase):
             else:
                 try:
                     # Try to open the terminal device.
-                    tmp = open('/xdev/tty', 'wb', buffering=0)
+                    tmp = open('/dev/tty', 'wb', buffering=0)
                 except OSError:
                     # As a fallback, use regular file to write control codes.
                     # Some functions (like savetty) will not work, but at

Mac/BuildScript/build-installer.py

@@ -242,15 +242,12 @@ def library_recipes():
 
     result.extend([
           dict(
-              name="OpenSSL 1.1.1g",
+              name="OpenSSL 1.1.1i",
-              url="https://www.openssl.org/source/openssl-1.1.1g.tar.gz",
+              url="https://www.openssl.org/source/openssl-1.1.1i.tar.gz",
-              checksum='76766e98997660138cdaf13a187bd234',
+              checksum='08987c3cf125202e2b0840035efb392c',
               buildrecipe=build_universal_openssl,
               configure=None,
               install=None,
-              patches=[
-                  "openssl-mac-arm64.patch",
-                   ],
           ),
     ])
 
@@ -263,10 +260,10 @@ def library_recipes():
             tk_patches = ['tk868_on_10_8_10_9.patch']
 
         else:
-            tcl_tk_ver='8.6.10'
+            tcl_tk_ver='8.6.11'
-            tcl_checksum='97c55573f8520bcab74e21bfd8d0aadc'
+            tcl_checksum='8a4c004f48984a03a7747e9ba06e4da4'
 
-            tk_checksum='602a47ad9ecac7bf655ada729d140a94'
+            tk_checksum='c7ee71a2d05bba78dfffd76528dc17c6'
             tk_patches = [ ]
 
 
@@ -357,9 +354,9 @@ def library_recipes():
                   ),
           ),
           dict(
-              name="SQLite 3.33.0",
+              name="SQLite 3.34.0",
-              url="https://sqlite.org/2020/sqlite-autoconf-3330000.tar.gz",
+              url="https://sqlite.org/2020/sqlite-autoconf-3340000.tar.gz",
-              checksum='842a8a100d7b01b09e543deb2b7951dd',
+              checksum='7f33c9db7b713957fcb9271fe9049fef',
               extra_cflags=('-Os '
                             '-DSQLITE_ENABLE_FTS5 '
                             '-DSQLITE_ENABLE_FTS4 '
@@ -1138,7 +1135,6 @@ def buildPythonDocs():
     if not os.path.exists(htmlDir):
         # Create virtual environment for docs builds with blurb and sphinx
         runCommand('make venv')
-        runCommand('venv/bin/python3 -m pip install -U Sphinx==2.3.1')
         runCommand('make html PYTHON=venv/bin/python')
     os.rename(htmlDir, docdir)
     os.chdir(curDir)
@@ -1615,7 +1611,7 @@ def buildDMG():
     if os.path.exists(outdir):
         shutil.rmtree(outdir)
 
-    # We used to use the deployment target as the last characters of the 
+    # We used to use the deployment target as the last characters of the
     # installer file name. With the introduction of weaklinked installer
     # variants, we may have two variants with the same file name, i.e.
     # both ending in '10.9'.  To avoid this, we now use the major/minor

Mac/BuildScript/openssl-mac-arm64.patch

@@ -1,41 +0,0 @@
-diff -ur openssl-1.1.1g-orig/Configurations/10-main.conf openssl-1.1.1g/Configurations/10-main.conf
---- openssl-1.1.1g-orig/Configurations/10-main.conf	2020-04-21 14:22:39.000000000 +0200
-+++ openssl-1.1.1g/Configurations/10-main.conf	2020-07-26 12:21:32.000000000 +0200
-@@ -1557,6 +1557,14 @@
-         bn_ops           => "SIXTY_FOUR_BIT_LONG",
-         perlasm_scheme   => "macosx",
-     },
-+    "darwin64-arm64-cc" => {
-+        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
-+        CFLAGS           => add("-Wall"),
-+        cflags           => add("-arch arm64"),
-+        lib_cppflags     => add("-DL_ENDIAN"),
-+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
-+        perlasm_scheme   => "ios64",
-+    },
- 
- ##### GNU Hurd
-     "hurd-x86" => {
-diff -ur openssl-1.1.1g-orig/config openssl-1.1.1g/config
---- openssl-1.1.1g-orig/config	2020-04-21 14:22:39.000000000 +0200
-+++ openssl-1.1.1g/config	2020-07-26 12:21:59.000000000 +0200
-@@ -255,6 +255,9 @@
- 		;;
- 	    x86_64)
- 		echo "x86_64-apple-darwin${VERSION}"
-+                ;;
-+	    arm64)
-+		echo "arm64-apple-darwin${VERSION}"
- 		;;
- 	    *)
- 		echo "i686-apple-darwin${VERSION}"
-@@ -497,6 +500,9 @@
- 	else
- 	    OUT="darwin64-x86_64-cc"
- 	fi ;;
-+  x86_64-apple-darwin*)
-+	OUT="darwin64-arm64-cc"
-+        ;;
-   armv6+7-*-iphoneos)
- 	__CNF_CFLAGS="$__CNF_CFLAGS -arch armv6 -arch armv7"
- 	__CNF_CXXFLAGS="$__CNF_CXXFLAGS -arch armv6 -arch armv7"

Misc/NEWS.d/next/Build/2021-01-04-05-07-30.bpo-42692.OO11SN.rst

@@ -0,0 +1 @@
+Fix __builtin_available check on older compilers. Patch by Joshua Root.

Misc/NEWS.d/next/macOS/2020-12-07-11-37-35.bpo-42584.LygmqQ.rst

@@ -0,0 +1 @@
+Update macOS installer to use SQLite 3.34.0.

Misc/NEWS.d/next/macOS/2021-01-04-00-48-08.bpo-41837.dX-unJ.rst

@@ -0,0 +1 @@
+Update macOS installer build to use OpenSSL 1.1.1i.

Misc/NEWS.d/next/macOS/2021-01-04-01-17-17.bpo-42361.eolZAi.rst

@@ -0,0 +1,2 @@
+Update macOS installer build to use Tcl/Tk 8.6.11 (rc2, expected to be final
+release).

Modules/posixmodule.c

@@ -61,7 +61,13 @@
  */
 #if defined(__APPLE__)
 
-#if defined(__has_builtin) && __has_builtin(__builtin_available)
+#if defined(__has_builtin)
+#if __has_builtin(__builtin_available)
+#define HAVE_BUILTIN_AVAILABLE 1
+#endif
+#endif
+
+#ifdef HAVE_BUILTIN_AVAILABLE
 #  define HAVE_FSTATAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)
 #  define HAVE_FACCESSAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)
 #  define HAVE_FCHMODAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)