Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.

Commit 5005890

Browse files
Switch to python3, resolve issue with differences in encrypt in python3
Change-Id: Ic6105abb59030960ed8bf9a16a30cfd90b0a4742
1 parent 0e35a4a commit 5005890

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,12 @@ cmake_minimum_required(VERSION 3.4.3)
3333
if(BS_USE_OSDM_BUILD_SYSTEM)
3434
include(${BUILD_SYS_INC}/utils.cmake)
3535
bs_find_patch()
36-
bs_find_python2()
3736
else()
3837
if (NOT PATCH)
3938
find_program(PATCH NAMES patch patch.exe)
4039
endif()
4140
if (NOT PYTHON)
42-
find_program(PYTHON NAMES python2 python python2.exe python.exe)
41+
find_program(PYTHON NAMES python3 python python3.exe python.exe)
4342
endif()
4443
endif()
4544

releases/10.0.0/patches_internal/configure_file-race-fix.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ diff -Naur --strip-trailing-cr a/utils/llvm-build/llvmbuild/main.py b/utils/llvm
1616
- ${CMAKE_CURRENT_BINARY_DIR}/DummyConfigureOutput)\n""" % (
1717
- cmake_quote_path(dep),))
1818
+ ${CMAKE_CURRENT_BINARY_DIR}/DummyConfigureOutput/%s)\n""" % (
19-
+ cmake_quote_path(dep),hashlib.sha1(dep).hexdigest()))
19+
+ cmake_quote_path(dep),hashlib.sha1(dep.encode('utf-8')).hexdigest()))
2020

2121
# Write the properties we use to encode the required library dependency
2222
# information in a form CMake can easily use directly.

0 commit comments

Comments
 (0)