80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Jenkins: Workaround for MacPorts upgrade dependency issues, and fix macOS architecture switching when building for x86_64h

Browse Source
This commit is contained in:
RichardG867
2022-10-25 19:21:00 -03:00
parent 089ead3f61
commit 4ac0ae0373
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.ci/build.sh
View File

@@ -555,8 +555,8 @@ then
# Switch into the correct architecture if required. # Switch into the correct architecture if required.
case $arch in case $arch in
x86_64*) arch_mac="i386";; x86_64*) arch_mac="i386"; arch_cmd="x86_64";;
*) arch_mac="$arch";; *) arch_mac="$arch"; arch_cmd="$arch";;
esac esac
if [ "$(arch)" != "$arch" -a "$(arch)" != "$arch_mac" ] if [ "$(arch)" != "$arch" -a "$(arch)" != "$arch_mac" ]
then then
@@ -566,7 +566,7 @@ then
args= args=
[ $strip -ne 0 ] && args="-t $args" [ $strip -ne 0 ] && args="-t $args"
[ $skip_archive -ne 0 ] && args="-n $args" [ $skip_archive -ne 0 ] && args="-n $args"
arch -"$arch" zsh -lc 'exec "'"$0"'" -b "'"$package_name"'" "'"$arch"'" '"$args""$cmake_flags" arch -"$arch_cmd" zsh -lc 'exec "'"$0"'" -b "'"$package_name"'" "'"$arch"'" '"$args""$cmake_flags"
exit $? exit $?
fi fi
echo [-] Using architecture [$(arch)] echo [-] Using architecture [$(arch)]
@@ -599,7 +599,21 @@ then
sudo sed -i -e 's/-no-feature-vulkan/-feature-vulkan/g' "$qt5_portfile" sudo sed -i -e 's/-no-feature-vulkan/-feature-vulkan/g' "$qt5_portfile"
sudo sed -i -e 's/configure.env-append MAKE=/configure.env-append VULKAN_SDK=${prefix} MAKE=/g' "$qt5_portfile" sudo sed -i -e 's/configure.env-append MAKE=/configure.env-append VULKAN_SDK=${prefix} MAKE=/g' "$qt5_portfile"
fi fi
sudo "$macports/bin/port" install $(cat .ci/dependencies_macports.txt) while :
do
# Attempt to install dependencies.
sudo "$macports/bin/port" install $(cat .ci/dependencies_macports.txt) 2>&1 | tee macports.log
# Stop if no port version activation errors were found.
stuck_dep=$(grep " cannot be built while another version of " macports.log | cut -d" " -f2)
[ -z $stuck_dep ] && break
# Deactivate the stuck dependency and try again.
sudo "$macports/bin/port" -f deactivate $stuck_dep
done
# Remove MacPorts error detection log.
rm -f macports.log
# Save build tag to skip this later. Doing it here (once everything is # Save build tag to skip this later. Doing it here (once everything is
# in place) is important to avoid potential issues with retried builds. # in place) is important to avoid potential issues with retried builds.