Merge pull request rubyjs#4 from sqreen/fix-2.3.0

Work around build failure on 2.3.0
cataphract · Sep 12, 2018 · 96f9382 · 96f9382
2 parents aee2029 + 97a610b
commit 96f9382
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,7 +23,7 @@ try {
             "1.9.3-p551"        : { test("1.9.3-p551") },
             "2.0.0-p647"        : { test("2.0.0-p647") },
             "2.2.3"             : { test("2.2.3") },
-            "2.3.3"             : { test("2.3.3") },
+            "2.3.0"             : { test("2.3.0") },
             "2.4.3"             : { test("2.4.3") },
             "2.5.0"             : { test("2.5.0") },
             "2.5.0_mini_racer"  : { test("2.5.0", 'LOAD_MINI_RACER=1') },

diff --git a/ext/mini_racer_extension/mini_racer_extension.cc b/ext/mini_racer_extension/mini_racer_extension.cc
@@ -1,4 +1,11 @@
 #include <stdio.h>
+
+// workaround for Ruby 2.3.0 and perhaps certain 2.2 versions
+// see https://bugs.ruby-lang.org/issues/11962
+#include <ruby/config.h>
+# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+# undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
+
 #include <ruby.h>
 #include <ruby/version.h>
 #if RUBY_API_VERSION_MAJOR > 1

diff --git a/lib/sqreen/mini_racer/version.rb b/lib/sqreen/mini_racer/version.rb
@@ -1,5 +1,7 @@
 module Sqreen
 module MiniRacer
-  VERSION = "0.2.0.beta3"
+  # part before qualifier is the number of the last upstream release
+  # since we synced with it
+  VERSION = "0.2.0.sqreen1"
 end
 end