Merge pull request #918 from nodenv/pull-ruby-build

pull ruby build
nodenv · Jun 3, 2024 · abd8119 · abd8119
2 parents 6fd7862 + 54fb8bb
commit abd8119
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/bin/node-build b/bin/node-build
@@ -787,6 +787,21 @@ fix_jxcore_directory_structure() {
   } >&4
 }
 
+# Kept for backward compatibility
+require_java7() {
+  require_java 7
+}
+
+# Kept for backward compatibility
+require_gcc() {
+  :
+}
+
+# Kept for backward compatibility
+require_llvm() {
+  :
+}
+
 # Ensure that directories listed in LDFLAGS exist
 build_package_ldflags_dirs() {
   local arg dir

diff --git a/test/build.bats b/test/build.bats
@@ -185,6 +185,7 @@ OUT
   stub_make_install
 
   export -n MAKE_OPTS
+  export NODE_CONFIGURE_OPTS="--with-openssl-dir=/test"
   run_inline_definition <<DEF
 install_package "node-v4.0.0" "http://nodejs.org/dist/v4.0.0/node-v4.0.0.tar.gz"
 DEF
@@ -195,7 +196,7 @@ DEF
   unstub make
 
   assert_build_log <<OUT
-node-v4.0.0: --prefix=$INSTALL_ROOT
+node-v4.0.0: --prefix=$INSTALL_ROOT --with-openssl-dir=/test
 make -j 1
 make install
 OUT