config_host.mk.in | 4 +
external/beanshell/ExternalProject_beanshell.mk | 2
external/hsqldb/ExternalProject_hsqldb.mk | 2
external/java_websocket/ExternalProject_java_websocket.mk | 2
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2
external/jfreereport/ExternalProject_jfreereport_flute.mk | 2
external/jfreereport/ExternalProject_jfreereport_libbase.mk | 2
external/jfreereport/ExternalProject_jfreereport_libfonts.mk | 2
external/jfreereport/ExternalProject_jfreereport_libformula.mk | 2
external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2
external/jfreereport/ExternalProject_jfreereport_libloader.mk | 2
external/jfreereport/ExternalProject_jfreereport_librepository.mk | 2
external/jfreereport/ExternalProject_jfreereport_libserializer.mk | 2
external/jfreereport/ExternalProject_jfreereport_libxml.mk | 2
external/jfreereport/ExternalProject_jfreereport_sac.mk | 2
external/libcdr/ExternalProject_libcdr.mk | 2
external/libebook/ExternalProject_libebook.mk | 2
external/libepubgen/ExternalProject_libepubgen.mk | 2
external/libfreehand/ExternalProject_libfreehand.mk | 2
external/liblangtag/ExternalProject_liblangtag.mk | 2
external/libqxp/ExternalProject_libqxp.mk | 2
external/libvisio/ExternalProject_libvisio.mk | 2
external/libzmf/ExternalProject_libzmf.mk | 2
solenv/bin/modules/installer.pm | 2
solenv/bin/modules/installer/control.pm | 4 +
solenv/bin/modules/installer/globals.pm | 2
solenv/bin/modules/installer/parameter.pm | 1
solenv/bin/modules/installer/windows/msiglobal.pm | 21
+++++-----
28 files changed, 43 insertions(+), 35 deletions(-)
New commits:
commit a97d983b501b28a2b5a9387efb6206b50097ffa1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Apr 19 14:54:12 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 26 14:00:43 2024 +0200
don't throw away command output when packaging installsets
and adjust installer to work with MSWin-style perl (like strawberry
perl)
Change-Id: I9305c7cb6ef72560bbf77626f113f3ee439b3ef3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166331
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 8c5c275adb91..5f9214e09e88 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -580,8 +580,6 @@ sub run {
installer::scriptitems::changing_name_of_language_dependent_keys($filesinproductlanguageresolvedarrayref);
- if ( $installer::globals::iswin and $^O =~ /MSWin/i ) {
installer::converter::convert_slash_to_backslash($filesinproductlanguageresolvedarrayref);
}
-
$filesinproductlanguageresolvedarrayref =
installer::scriptitems::remove_non_existent_languages_in_productlists($filesinproductlanguageresolvedarrayref,
$languagestringref, "Name", "file");
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($filesinproductlanguageresolvedarrayref,
$dirsinproductarrayref);
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index d126e917b57f..4faff4f39b9f 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -87,6 +87,8 @@ sub check_system_path
map { my $dir = qx{cygpath -m "$_"}; chomp($dir); $dir
}
split /\Q$local_pathseparator\E\s*/, $pathvariable;
$local_pathseparator = ';';
+ } elsif ( $^O =~ /MSWin/i ) {
+ $local_pathseparator = ';';
}
my $patharrayref =
installer::converter::convert_stringlist_into_array(\$pathvariable,
$local_pathseparator);
@@ -96,7 +98,7 @@ sub check_system_path
if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
{
- @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe",
"uuidgen", "makecab.exe", "msitran.exe", "expand.exe");
+ @needed_files_in_path = ("msiinfo.exe", "msidb.exe", "uuidgen.exe",
"makecab.exe", "msitran.exe", "expand.exe");
}
elsif ($installer::globals::iswin)
{
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 045d9d6afde9..0dc148a9155a 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -265,7 +265,7 @@ BEGIN
@installer::globals::removedirs = ();
@installer::globals::removefiletable = ();
- if ( $^O =~ /cygwin/i )
+ if ( $^O =~ /cygwin/i || $^O =~ /MSWin/i )
{
$installer::globals::zippath = "zip"; # Has to be in
the path: /usr/bin/zip
$installer::globals::separator = "/";
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index b183057eac1e..98910d53b756 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -187,6 +187,7 @@ sub control_fundamental_parameter
sub make_path_absolute
{
my ($pathref) = @_;
+ return if ( $^O =~ /MSWin/i ); # no need to do anything here
if ( $installer::globals::isunix )
{
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 38146abb51d2..51e91af12be3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -461,7 +461,7 @@ sub create_msi_database
$msifilename = installer::converter::make_path_conform($msifilename);
- if ( $^O =~ /cygwin/i ) {
+ if ( $^O =~ /cygwin/i || $^O =~ /MSWin/i ) {
# msidb.exe really wants backslashes. (And double escaping because
system() expands the string.)
$idtdirbase =~ s/\//\\/g;
$msifilename =~ s/\//\\/g;
@@ -472,14 +472,15 @@ sub create_msi_database
}
my $systemcall = $msidb . " -f " . $idtdirbase . " -d " . $msifilename . "
-c " . "-i " . $extraslash . "*";
- my $returnvalue = system($systemcall);
+ my $systemcall_output = `$systemcall`;
+ my $returnvalue = $? >> 8;
my $infoline = "Systemcall: $systemcall
";
push( @installer::globals::logfileinfo, $infoline);
if ($returnvalue)
{
- $infoline = "ERROR: Could not execute $msidb!
";
+ $infoline = "ERROR: Could not execute $msidb! - returncode:
$returnvalue - output:
$systemcall_output
";
push( @installer::globals::logfileinfo, $infoline);
}
else
@@ -625,14 +626,15 @@ sub write_summary_into_msi_database
. " -j " . $subject . " -o " . $comment . " -k " .
$keywords . " -n " . $appname
. " -u " . $security . " -w " . $wordcount;
- my $returnvalue = system($systemcall);
+ my $systemcall_output = `$systemcall`;
+ my $returnvalue = $? >> 8;
my $infoline = "Systemcall: $systemcall
";
push( @installer::globals::logfileinfo, $infoline);
if ($returnvalue)
{
- $infoline = "ERROR: Could not execute $systemcall (return $returnvalue)
";
+ $infoline = "ERROR: Could not execute $systemcall (return
$returnvalue) - output:
$systemcall_output
";
push( @installer::globals::logfileinfo, $infoline);
}
else
@@ -808,16 +810,17 @@ sub create_transforms
}
}
- my $systemcall = "TEMP=$ENV{'TMPDIR'} $cscript \"$wilangid\" $basedbname
Package $templatevalue";
-
- my $returnvalue = system($systemcall);
+ $ENV{TEMP} = $ENV{TMPDIR};
+ my $systemcall = "$cscript \"$wilangid\" $basedbname Package
$templatevalue";
+ my $systemcall_output = `$systemcall`;
+ my $returnvalue = $? >> 8;
my $infoline = "Systemcall: $systemcall
";
push( @installer::globals::logfileinfo, $infoline);
if ($returnvalue)
{
- $infoline = "ERROR: $returnvalue from $systemcall
";
+ $infoline = "ERROR: $returnvalue from $systemcall - output:
$systemcall_output
";
push( @installer::globals::logfileinfo, $infoline);
}
else
commit 3c54cb2a9d731d8315f32ad8a4ced2a8d6b508de
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Jul 11 15:15:18 2023 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 26 14:00:35 2024 +0200
add MSYS_NO_PATHCONV=1 to prevent MSYS auto-magic
git-bash/MSYS tries to resolve anything that looks like a path (i.e.
anything starting with a /) - if the "target" doesn't exists, it just
prepends the MSYS installation dir and breaks all kind of stuff.
You could escape those with double-slash at the beginning, but that
would mean lots of noise/unnecessary changes in pretty much every
makefile, so just getting rid of that behavior is much better.
ant and some externals however rely on MSYS path-conversion, so unset
MSYS_NO_PATHCONV for those. Ant does its own checks whether it
runs under cygwin or msys, and easier to please externals using the
autoconversion than to add patches to force them into compliance…
Change-Id: Ie80964e40c53ace80adb4707aae0db63ebc4ee4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166330
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/config_host.mk.in b/config_host.mk.in
index 1d5a83add0c0..c1cd96717707 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -789,3 +789,7 @@ include $(BUILDDIR)/config_$(gb_Side)_lang.mk
# tarball names
# does use some of the variables defined above
include @SRC_ROOT@/download.lst
+
+# prep for WSL-as-helper-builds where build runs from within git-bash/MSYS
that would otherwise
+# messes with anything that looks like a path (starts with /) but it cannot
resolve
+export MSYS_NO_PATHCONV=1
\ No newline at end of file
diff --git a/external/beanshell/ExternalProject_beanshell.mk
b/external/beanshell/ExternalProject_beanshell.mk
index 450ac2b706dd..604b3571fe44 100644
--- a/external/beanshell/ExternalProject_beanshell.mk
+++ b/external/beanshell/ExternalProject_beanshell.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\
$(call gb_ExternalProject_get_state_target,beanshell,build) :
$(call gb_Trace_StartRange,beanshell,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/hsqldb/ExternalProject_hsqldb.mk
b/external/hsqldb/ExternalProject_hsqldb.mk
index 67ae75106bc2..4e5c750c7f3c 100644
--- a/external/hsqldb/ExternalProject_hsqldb.mk
+++ b/external/hsqldb/ExternalProject_hsqldb.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\
$(call gb_ExternalProject_get_state_target,hsqldb,build) :
$(call gb_Trace_StartRange,hsqldb,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(if $(JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD), \
ANT_OPTS="$$ANT_OPTS -Djava.security.manager=allow") \
$(ICECREAM_RUN) "$(ANT)" \
diff --git a/external/java_websocket/ExternalProject_java_websocket.mk
b/external/java_websocket/ExternalProject_java_websocket.mk
index 0d713aadc02d..9d4a62d81183 100644
--- a/external/java_websocket/ExternalProject_java_websocket.mk
+++ b/external/java_websocket/ExternalProject_java_websocket.mk
@@ -16,7 +16,7 @@ $(eval $(call
gb_ExternalProject_register_targets,java_websocket,\
$(call gb_ExternalProject_get_state_target,java_websocket,build) :
$(call gb_Trace_StartRange,java_websocket,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 55868ea9bac9..a41206b506f0 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -20,7 +20,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_flow_engine,\
$(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
$(call gb_Trace_StartRange,jfreereport_flow_engine,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_flute.mk
b/external/jfreereport/ExternalProject_jfreereport_flute.mk
index 120c98cbdbb4..1a57167246c0 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_flute,\
$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
$(call gb_Trace_StartRange,jfreereport_flute,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libbase.mk
b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
index 6d97ffa5762a..864b13ed1519 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_libbase,\
$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
$(call gb_Trace_StartRange,jfreereport_libbase,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
index 9a6edf0b891f..6b7da7b5c52b 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_libfonts,\
$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
$(call gb_Trace_StartRange,jfreereport_libfonts,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libformula.mk
b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
index 1182873e66aa..5211d54fbca9 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_libformula,\
$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
$(call gb_Trace_StartRange,jfreereport_libformula,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 7c7478e07368..0ea331570b77 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -28,7 +28,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_liblayout,\
$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
$(call gb_Trace_StartRange,jfreereport_liblayout,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libloader.mk
b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
index ddb34e3d8614..5c5964b9e17a 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_libloader,\
$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
$(call gb_Trace_StartRange,jfreereport_libloader,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_librepository.mk
b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
index 59fa203fbe63..49d7e9497fb9 100644
--- a/external/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_librepository,\
$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
$(call gb_Trace_StartRange,jfreereport_librepository,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
index 1226e14206d4..d0d37a59bded 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_libserializer,\
$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
$(call gb_Trace_StartRange,jfreereport_libserializer,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libxml.mk
b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
index 295573ec67ab..f79bf3731eac 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_libxml,\
$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
$(call gb_Trace_StartRange,jfreereport_libxml,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/jfreereport/ExternalProject_jfreereport_sac.mk
b/external/jfreereport/ExternalProject_jfreereport_sac.mk
index a33186183ee7..807f30e37ab5 100644
--- a/external/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -16,7 +16,7 @@ $(eval $(call
gb_ExternalProject_register_targets,jfreereport_sac,\
$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
$(call gb_Trace_StartRange,jfreereport_sac,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
+ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
$(ICECREAM_RUN) "$(ANT)" \
$(if $(verbose),-v,-q) \
-f build.xml \
diff --git a/external/libcdr/ExternalProject_libcdr.mk
b/external/libcdr/ExternalProject_libcdr.mk
index c9f5401ac43f..3a4be9d9ce73 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
$(call gb_Trace_StartRange,libcdr,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
+ && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/external/libebook/ExternalProject_libebook.mk
b/external/libebook/ExternalProject_libebook.mk
index 9760be7d298b..e1b04df38087 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(call gb_Trace_StartRange,libebook,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
+ && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/external/libepubgen/ExternalProject_libepubgen.mk
b/external/libepubgen/ExternalProject_libepubgen.mk
index f0dbf70a2eb2..0f34d10665e4 100644
--- a/external/libepubgen/ExternalProject_libepubgen.mk
+++ b/external/libepubgen/ExternalProject_libepubgen.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,libepubgen,build) :
$(call gb_Trace_StartRange,libepubgen,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
+ && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/external/libfreehand/ExternalProject_libfreehand.mk
b/external/libfreehand/ExternalProject_libfreehand.mk
index 554017cafd5f..a3b4859bb3af 100644
--- a/external/libfreehand/ExternalProject_libfreehand.mk
+++ b/external/libfreehand/ExternalProject_libfreehand.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build)
:
$(call gb_Trace_StartRange,libfreehand,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
+ && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/external/liblangtag/ExternalProject_liblangtag.mk
b/external/liblangtag/ExternalProject_liblangtag.mk
index a682250ebe8e..4e07b9fe4278 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,liblangtag,\
$(call gb_ExternalProject_get_state_target,liblangtag,build):
$(call gb_Trace_StartRange,liblangtag,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure --disable-modules
--disable-test --disable-introspection --with-pic \
+ unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure --disable-modules --disable-test --disable-introspection --with-pic
\
$(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \
--disable-shared --enable-static, \
--enable-shared --disable-static) \
diff --git a/external/libqxp/ExternalProject_libqxp.mk
b/external/libqxp/ExternalProject_libqxp.mk
index fea48ffc4b11..0cafe24e0634 100644
--- a/external/libqxp/ExternalProject_libqxp.mk
+++ b/external/libqxp/ExternalProject_libqxp.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) :
$(call gb_Trace_StartRange,libqxp,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
+ && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/external/libvisio/ExternalProject_libvisio.mk
b/external/libvisio/ExternalProject_libvisio.mk
index 01fe27290f45..abf7cbd728df 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
$(call gb_Trace_StartRange,libvisio,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
+ && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/external/libzmf/ExternalProject_libzmf.mk
b/external/libzmf/ExternalProject_libzmf.mk
index 1a338526c12b..2bba4d2e427a 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libzmf,build) :
$(call gb_Trace_StartRange,libzmf,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
+ && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure \
--with-pic \
--enable-static \
--disable-shared \
