Fix inline redefinition in Visual Studio when compiling C++ code

automerged PR by conda-forge/automerge-action
conda-forge · Nov 10, 2020 · e42c5e5 · e42c5e5
2 parents c4b1a32 + 8caaa95
commit e42c5e5
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 20 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -2,6 +2,8 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '7'
+cdt_name:
+- cos6
 channel_sources:
 - conda-forge,defaults
 channel_targets:
@@ -37,5 +39,8 @@ readline:
 - '8.0'
 target_platform:
 - linux-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
 zlib:
 - '1.2'
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '7.5'
+- '7'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7.5'
+- '7'
 docker_image:
 - condaforge/linux-anvil-aarch64
 gmp:
@@ -43,5 +43,8 @@ readline:
 - '8.0'
 target_platform:
 - linux-aarch64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
 zlib:
 - '1.2'
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -2,6 +2,8 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '8'
+cdt_name:
+- cos7
 channel_sources:
 - conda-forge,defaults
 channel_targets:
@@ -37,5 +39,8 @@ readline:
 - '8.0'
 target_platform:
 - linux-ppc64le
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
 zlib:
 - '1.2'
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -39,5 +39,8 @@ readline:
 - '8.0'
 target_platform:
 - osx-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
 zlib:
 - '1.2'
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -6,13 +6,9 @@ channel_targets:
 - conda-forge main
 cxx_compiler:
 - vs2017
-libffi:
-- '3.2'
 openssl:
 - 1.1.1
 pin_run_as_build:
-  libffi:
-    max_pin: x.x
   openssl:
     max_pin: x.x.x
   zlib:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/fix-inline-redefinition-msvc.patch b/recipe/fix-inline-redefinition-msvc.patch
@@ -0,0 +1,28 @@
+From 49bb2e64ccca130f8e1a0b6ad36d442c1ad44ed7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
+ <[email protected]>
+Date: Sat, 15 Feb 2020 18:30:53 +0900
+Subject: [PATCH] avoid defining inline
+
+Recent (since 2012 maybe?) MSVC ships a header named xkeycheck.h, which
+(kindly!) aborts compilation on redefinition of C++ keywords.  Let's not
+define this in case of C++.
+---
+ win32/Makefile.sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/win32/Makefile.sub b/win32/Makefile.sub
+index ea5789fd3e9d..bd350dcd3175 100644
+--- a/win32/Makefile.sub
++++ b/win32/Makefile.sub
+@@ -860,8 +860,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
+ #define RUBY_SETJMP(env) _setjmp(env)
+ #define RUBY_LONGJMP(env,val) longjmp(env,val)
+ #define RUBY_JMP_BUF jmp_buf
+-#define inline __inline
+ #ifndef __cplusplus
++#define inline __inline
+ !if $(MSC_VER) >= 1800
+ #define restrict __restrict
+ !else
+
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -12,9 +12,10 @@ source:
   patches:
     # Patches/work-arounds for passing make check
     - disable-backtrace-with-lines.patch
+    - fix-inline-redefinition-msvc.patch  # [win]
 
 build:
-  number: 0
+  number: 1
   track_features:
     - rb{{ major_minor | replace(".", "") }}
   run_exports: