keep libexpat DLL needed by XML::XPath dependency for Proxy plugin

TECLIB · Jul 30, 2019 · 2102c77 · 2102c77
1 parent 5820250
commit 2102c77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Perl/Scripts/build-strawberry-perl-package-for-fusioninventory-agent.sh b/Perl/Scripts/build-strawberry-perl-package-for-fusioninventory-agent.sh
@@ -265,6 +265,7 @@ while (( ${iter} < ${#archs[@]} )); do
    eval ${install} "${strawberry_arch_path}/portableshell.bat" "${tmpdir}/Strawberry/${strawberry_version}/${arch}"
    eval ${install} "${strawberry_arch_path}/c/bin/dmake.exe" "${tmpdir}/Strawberry/${strawberry_version}/${arch}/c/bin"
    eval ${install} "${strawberry_arch_path}/c/bin/libbz2-1*.dll" "${tmpdir}/Strawberry/${strawberry_version}/${arch}/c/bin"
+   eval ${install} "${strawberry_arch_path}/c/bin/libexpat*.dll" "${tmpdir}/Strawberry/${strawberry_version}/${arch}/c/bin"
    eval ${install} "${strawberry_arch_path}/c/bin/liblzma-5*.dll" "${tmpdir}/Strawberry/${strawberry_version}/${arch}/c/bin"
    eval ${install} "${strawberry_arch_path}/c/bin/libssl*.dll" "${tmpdir}/Strawberry/${strawberry_version}/${arch}/c/bin"
    eval ${install} "${strawberry_arch_path}/c/bin/libcrypto*.dll" "${tmpdir}/Strawberry/${strawberry_version}/${arch}/c/bin"

diff --git a/Perl/Scripts/load-perl-environment b/Perl/Scripts/load-perl-environment
@@ -54,7 +54,7 @@ declare -r strawberry_arch_path='${strawberry_path}/${arch}'
 declare -r strawberry_arch_url='http://strawberryperl.com/download/${strawberry_version}/strawberry-perl-${strawberry_version}-${arch_label}-portable.zip'
 
 declare -r strawberry_pepfia_branch='2.5.x'
-declare -r strawberry_pepfia_build_id='1'
+declare -r strawberry_pepfia_build_id='2'
 declare -r strawberry_pepfia_path="${strawberry_path%/${strawberry_version}}"
 declare -r strawberry_pepfia_file="strawberry-perl-${strawberry_version}-all-pepfia-${strawberry_pepfia_branch}-${strawberry_pepfia_build_id}.tar.xz"
 declare -r strawberry_pepfia_par_file='strawberry-perl-${strawberry_version}-${arch}-par-pepfia-${strawberry_pepfia_branch}-${strawberry_pepfia_build_id}.zip'