Skip to content

Commit 5694378

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240108.6 (#39)
[main] Update dependencies from dotnet/arcade
1 parent 062156d commit 5694378

31 files changed

+256
-74
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24058.6">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
8+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

eng/common/build.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
3+
exit /b %ErrorLevel%

eng/common/build.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Param(
1919
[switch] $pack,
2020
[switch] $publish,
2121
[switch] $clean,
22+
[switch] $verticalBuild,
2223
[switch][Alias('bl')]$binaryLog,
2324
[switch][Alias('nobl')]$excludeCIBinarylog,
2425
[switch] $ci,
@@ -58,6 +59,7 @@ function Print-Usage() {
5859
Write-Host " -sign Sign build outputs"
5960
Write-Host " -publish Publish artifacts (e.g. symbols)"
6061
Write-Host " -clean Clean the solution"
62+
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
6163
Write-Host ""
6264

6365
Write-Host "Advanced settings:"
@@ -120,6 +122,7 @@ function Build {
120122
/p:Deploy=$deploy `
121123
/p:Test=$test `
122124
/p:Pack=$pack `
125+
/p:ArcadeBuildVertical=$verticalBuild `
123126
/p:IntegrationTest=$integrationTest `
124127
/p:PerformanceTest=$performanceTest `
125128
/p:Sign=$sign `

eng/common/build.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
5959
restore=false
6060
build=false
6161
source_build=false
62+
vertical_build=false
6263
rebuild=false
6364
test=false
6465
integration_test=false
@@ -105,7 +106,7 @@ while [[ $# > 0 ]]; do
105106
-binarylog|-bl)
106107
binary_log=true
107108
;;
108-
-excludeCIBinarylog|-nobl)
109+
-excludecibinarylog|-nobl)
109110
exclude_ci_binary_log=true
110111
;;
111112
-pipelineslog|-pl)
@@ -129,6 +130,12 @@ while [[ $# > 0 ]]; do
129130
restore=true
130131
pack=true
131132
;;
133+
-verticalbuild|-vb)
134+
build=true
135+
vertical_build=true
136+
restore=true
137+
pack=true
138+
;;
132139
-test|-t)
133140
test=true
134141
;;
@@ -220,6 +227,7 @@ function Build {
220227
/p:Restore=$restore \
221228
/p:Build=$build \
222229
/p:ArcadeBuildFromSource=$source_build \
230+
/p:ArcadeBuildVertical=$vertical_build \
223231
/p:Rebuild=$rebuild \
224232
/p:Test=$test \
225233
/p:Pack=$pack \

eng/common/cross/build-rootfs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ while :; do
182182
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
183183
__QEMUArch=riscv64
184184
__UbuntuArch=riscv64
185-
__UbuntuRepo="http://deb.debian.org/debian-ports"
185+
__UbuntuRepo="http://deb.debian.org/debian"
186186
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
187187
unset __LLDB_Package
188188

189-
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
190-
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
189+
if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
190+
__Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
191191
fi
192192
;;
193193
ppc64le)
@@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
487487
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
488488
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
489489
-U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
490-
search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
490+
search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
491491
fi
492492

493493
# install all packages in one go
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deb http://deb.debian.org/debian-ports sid main
1+
deb http://deb.debian.org/debian sid main

eng/common/cross/tizen-build-rootfs.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ case "$ARCH" in
2222
TIZEN_ARCH="x86_64"
2323
LINK_ARCH="x86"
2424
;;
25+
riscv64)
26+
TIZEN_ARCH="riscv64"
27+
LINK_ARCH="riscv"
28+
;;
2529
*)
2630
echo "Unsupported architecture for tizen: $ARCH"
2731
exit 1
@@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR
5862
echo ">>Start configuring Tizen rootfs"
5963
ln -sfn asm-${LINK_ARCH} ./usr/include/asm
6064
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
65+
if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
66+
echo "Fixing broken symlinks in $PWD"
67+
rm ./usr/lib64/libresolv.so
68+
ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
69+
rm ./usr/lib64/libpthread.so
70+
ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
71+
rm ./usr/lib64/libdl.so
72+
ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
73+
rm ./usr/lib64/libutil.so
74+
ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
75+
rm ./usr/lib64/libm.so
76+
ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
77+
rm ./usr/lib64/librt.so
78+
ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
79+
rm ./lib/ld-linux-riscv64-lp64d.so.1
80+
ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
81+
fi
6182
echo "<<Finish configuring Tizen rootfs"

eng/common/cross/tizen-fetch.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,28 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159+
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160+
BASE="Tizen-Base-RISCV"
161+
UNIFIED="Tizen-Unified-RISCV"
162+
else
163+
BASE="Tizen-Base"
164+
UNIFIED="Tizen-Unified"
165+
fi
166+
159167
Inform "Initialize ${TIZEN_ARCH} base"
160-
fetch_tizen_pkgs_init standard Tizen-Base
168+
fetch_tizen_pkgs_init standard $BASE
161169
Inform "fetch common packages"
162170
fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
163171
Inform "fetch coreclr packages"
164-
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
172+
fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
173+
if [ "$TIZEN_ARCH" != "riscv64" ]; then
174+
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
175+
fi
165176
Inform "fetch corefx packages"
166177
fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
167178

168179
Inform "Initialize standard unified"
169-
fetch_tizen_pkgs_init standard Tizen-Unified
180+
fetch_tizen_pkgs_init standard $UNIFIED
170181
Inform "fetch corefx packages"
171182
fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
172183

eng/common/cross/toolchain.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
8080
set(TOOLCHAIN "riscv64-alpine-linux-musl")
8181
else()
8282
set(TOOLCHAIN "riscv64-linux-gnu")
83+
if(TIZEN)
84+
set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
85+
endif()
8386
endif()
8487
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
8588
set(CMAKE_SYSTEM_PROCESSOR s390x)
@@ -144,6 +147,10 @@ if(TIZEN)
144147
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
145148
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
146149
endif()
150+
if(TARGET_ARCH_NAME STREQUAL "riscv64")
151+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
152+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
153+
endif()
147154
endif()
148155

149156
if(ANDROID)
@@ -270,7 +277,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
270277
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271278
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
272279
endif()
273-
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280+
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
274281
if(TIZEN)
275282
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
276283
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
@@ -281,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
281288
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
282289
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
283290
endif()
291+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
292+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
284293
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285294
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
286295
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -328,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
328337
if(TARGET_ARCH_NAME STREQUAL "armel")
329338
add_compile_options(-mfloat-abi=softfp)
330339
endif()
340+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
341+
add_compile_options("--target=${TOOLCHAIN}")
331342
elseif(TARGET_ARCH_NAME STREQUAL "x86")
332343
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
333344
add_compile_options(--target=${TOOLCHAIN})

eng/common/darc-init.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
3+
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16',
44
$verbosity = 'minimal',
55
$toolpath = $null
66
)

0 commit comments

Comments
 (0)