diff options
| -rw-r--r-- | Documentation/building/android.md | 1 | ||||
| -rw-r--r-- | Documentation/building/linux-instructions.md | 5 | ||||
| -rw-r--r-- | Documentation/building/unix-test-instructions.md | 2 | ||||
| -rwxr-xr-x | cross/armel/tizen-fetch.sh | 2 | ||||
| -rw-r--r-- | cross/armel/tizen/tizen-dotnet.ks | 1 | ||||
| -rwxr-xr-x | cross/build-android-rootfs.sh | 10 |
6 files changed, 4 insertions, 17 deletions
diff --git a/Documentation/building/android.md b/Documentation/building/android.md index cfb509dc2f..9f85ad7569 100644 --- a/Documentation/building/android.md +++ b/Documentation/building/android.md @@ -43,7 +43,6 @@ You can run the PAL tests on an Android device. To run the tests, you first copy To copy the PAL tests over to an Android phone: ``` adb push bin/obj/Linux.arm64.Debug/src/pal/tests/palsuite/ /data/local/tmp/coreclr/src/pal/tests/palsuite -adb push cross/android/toolchain/arm64/sysroot/usr/lib/libuuid.so.1 /data/local/tmp/coreclr/lib adb push cross/android/toolchain/arm64/sysroot/usr/lib/libintl.so /data/local/tmp/coreclr/lib adb push cross/android/toolchain/arm64/sysroot/usr/lib/libandroid-support.so /data/local/tmp/coreclr/lib/ adb push cross/android/toolchain/arm64/sysroot/usr/lib/libandroid-glob.so /data/local/tmp/coreclr/lib/ diff --git a/Documentation/building/linux-instructions.md b/Documentation/building/linux-instructions.md index 7892772ffb..e3738cdcc3 100644 --- a/Documentation/building/linux-instructions.md +++ b/Documentation/building/linux-instructions.md @@ -29,7 +29,6 @@ Install the following packages for the toolchain: - liblttng-ust-dev - libcurl4-openssl-dev - libssl-dev -- uuid-dev - libkrb5-dev - libnuma-dev (optional, enables numa support) @@ -43,7 +42,7 @@ For other version of Debian/Ubuntu, please visit http://apt.llvm.org/. Then install the packages you need: - ~$ sudo apt-get install cmake llvm-3.9 clang-3.9 lldb-3.9 liblldb-3.9-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libcurl4-openssl-dev libssl-dev uuid-dev libnuma-dev libkrb5-dev + ~$ sudo apt-get install cmake llvm-3.9 clang-3.9 lldb-3.9 liblldb-3.9-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libcurl4-openssl-dev libssl-dev libnuma-dev libkrb5-dev The lldb 3.9 package needs a lib file symbolic link fixed: @@ -54,7 +53,7 @@ You now have all the required components. If you are using Fedora, then you will need to install the following packages: - ~$ sudo dnf install llvm cmake clang lldb-devel libunwind-devel lttng-ust-devel libuuid-devel libicu-devel numactl-devel + ~$ sudo dnf install llvm cmake clang lldb-devel libunwind-devel lttng-ust-devel libicu-devel numactl-devel Git Setup --------- diff --git a/Documentation/building/unix-test-instructions.md b/Documentation/building/unix-test-instructions.md index 19149160f2..bd15f173aa 100644 --- a/Documentation/building/unix-test-instructions.md +++ b/Documentation/building/unix-test-instructions.md @@ -82,7 +82,7 @@ Options: Now download the coreclr armhf dependencies. ``` -sudo apt-get install libunwind8:armhf libunwind8-dev:armhf libicu-dev:armhf liblttng-ust-dev:armhf libcurl4-openssl-dev:armhf libicu-dev:armhf libssl-dev uuid-dev:armhf libkrb5-dev:armhf +sudo apt-get install libunwind8:armhf libunwind8-dev:armhf libicu-dev:armhf liblttng-ust-dev:armhf libcurl4-openssl-dev:armhf libicu-dev:armhf libssl-dev libkrb5-dev:armhf ``` **Running tests** diff --git a/cross/armel/tizen-fetch.sh b/cross/armel/tizen-fetch.sh index 6048ead4a6..77e7bbc386 100755 --- a/cross/armel/tizen-fetch.sh +++ b/cross/armel/tizen-fetch.sh @@ -160,7 +160,7 @@ Inform "fetch common packages" fetch_tizen_pkgs armv7l gcc glibc glibc-devel fetch_tizen_pkgs noarch linux-glibc-devel Inform "fetch coreclr packages" -fetch_tizen_pkgs armv7l lldb lldb-devel libuuid libuuid-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel +fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel Inform "fetch corefx packages" fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel diff --git a/cross/armel/tizen/tizen-dotnet.ks b/cross/armel/tizen/tizen-dotnet.ks index d67cf2bb40..5da27dbb88 100644 --- a/cross/armel/tizen/tizen-dotnet.ks +++ b/cross/armel/tizen/tizen-dotnet.ks @@ -32,7 +32,6 @@ ca-certificates ### Core FX libicu -libuuid libunwind iputils zlib diff --git a/cross/build-android-rootfs.sh b/cross/build-android-rootfs.sh index ea37f75754..adceda877a 100755 --- a/cross/build-android-rootfs.sh +++ b/cross/build-android-rootfs.sh @@ -105,14 +105,6 @@ mkdir -p $__Android_Cross_Dir/tmp/$arch/ wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu-dev_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb -if [ "$__AndroidArch" == "arm" ]; then - wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libuuid-dev-1.0.3-1_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libuuid-dev_1.0.3-1_$__AndroidArch.deb - wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libuuid-1.0.3-1_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libuuid_1.0.3-1_$__AndroidArch.deb -else - wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libuuid-dev_1.0.3-1_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libuuid-dev_1.0.3-1_$__AndroidArch.deb - wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libuuid_1.0.3-1_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libuuid_1.0.3-1_$__AndroidArch.deb -fi - wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob-dev_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support-dev_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb @@ -125,8 +117,6 @@ wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind echo Unpacking Termux packages dpkg -x $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ dpkg -x $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libuuid-dev_1.0.3-1_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libuuid_1.0.3-1_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ dpkg -x $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ dpkg -x $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ dpkg -x $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ |