From d143d77da07f8f699024d6efd09a363cb8447b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Fri, 20 Dec 2024 09:20:22 +0100 Subject: [PATCH 1/3] use the expected default value for windows prefix --- lib/omnibus/builder.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/omnibus/builder.rb b/lib/omnibus/builder.rb index efefdd450..654c66352 100644 --- a/lib/omnibus/builder.rb +++ b/lib/omnibus/builder.rb @@ -216,7 +216,8 @@ def configure(*args) # Accept a prefix override if provided. Can be set to '' to suppress # this functionality. - prefix = options.delete(:prefix) || "#{install_dir}/embedded" + default_prefix = unless windows? then "#{install_dir}/embedded" else python_3_embedded end + prefix = options.delete(:prefix) || default_prefix configure_cmd << "--prefix=#{prefix}" if prefix && prefix != "" configure_cmd.concat args From 1920385f4d8eda8c978b6bac9685ce00896fe830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Fri, 20 Dec 2024 13:26:38 +0100 Subject: [PATCH 2/3] allow --build to be ommited from configure args --- lib/omnibus/builder.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/omnibus/builder.rb b/lib/omnibus/builder.rb index 654c66352..5370724e3 100644 --- a/lib/omnibus/builder.rb +++ b/lib/omnibus/builder.rb @@ -209,7 +209,8 @@ def configure(*args) # arrive at differently terrible wild ass guesses for what MSYSTEM=MINGW64 # means. This can be anything from x86_64-pc-mingw64 to i686-pc-mingw32 # which doesn't even make any sense... - if windows? + no_force_build = options.delete(:no_build_triplet) || false + if windows? && !no_force_build platform = windows_arch_i386? ? "i686-w64-mingw32" : "x86_64-w64-mingw32" configure_cmd << "--build=#{platform}" end From 217743f074f9173899fedffa558f5cfb267529f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Fri, 20 Dec 2024 14:27:12 +0100 Subject: [PATCH 3/3] replace unless with if not --- lib/omnibus/builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/omnibus/builder.rb b/lib/omnibus/builder.rb index 5370724e3..c64272fd2 100644 --- a/lib/omnibus/builder.rb +++ b/lib/omnibus/builder.rb @@ -217,7 +217,7 @@ def configure(*args) # Accept a prefix override if provided. Can be set to '' to suppress # this functionality. - default_prefix = unless windows? then "#{install_dir}/embedded" else python_3_embedded end + default_prefix = if !windows? then "#{install_dir}/embedded" else python_3_embedded end prefix = options.delete(:prefix) || default_prefix configure_cmd << "--prefix=#{prefix}" if prefix && prefix != ""