added cross-compile file toolchain.make.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6548c4..11c6b66 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,14 +15,44 @@ add_subdirectory("lib/protobuf")
 add_subdirectory("lib/zlib")
 
 add_executable(lpmake)
-
 target_sources(lpmake PRIVATE "partition_tools/lpmake.cc")
 target_include_directories(lpmake PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
 target_compile_definitions(lpmake PRIVATE -D_FILE_OFFSET_BITS=64)
 target_compile_options(lpmake PRIVATE -std=c++17)
-
 target_link_libraries(lpmake PRIVATE liblp libsparse ext4_utils zlib base fmtlib liblog libcrypto_utils boringssl pthread)
 
+add_executable(lpadd)
+target_sources(lpadd PRIVATE "partition_tools/lpadd.cc")
+target_include_directories(lpadd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
+target_compile_definitions(lpadd PRIVATE -D_FILE_OFFSET_BITS=64)
+target_compile_options(lpadd PRIVATE -std=c++17)
+target_link_libraries(lpadd PRIVATE liblp libsparse ext4_utils zlib base fmtlib liblog libcrypto_utils boringssl pthread)
+
+add_executable(lpflash)
+target_sources(lpflash PRIVATE "partition_tools/lpflash.cc")
+target_include_directories(lpflash PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
+target_compile_definitions(lpflash PRIVATE -D_FILE_OFFSET_BITS=64)
+target_compile_options(lpflash PRIVATE -std=c++17)
+target_link_libraries(lpflash PRIVATE liblp libsparse ext4_utils zlib base fmtlib liblog libcrypto_utils boringssl pthread)
+
+add_executable(lpunpack)
+target_sources(lpunpack PRIVATE "partition_tools/lpunpack.cc")
+target_include_directories(lpunpack PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
+target_compile_definitions(lpunpack PRIVATE -D_FILE_OFFSET_BITS=64)
+target_compile_options(lpunpack PRIVATE -std=c++17)
+target_link_libraries(lpunpack PRIVATE liblp libsparse ext4_utils zlib base fmtlib liblog libcrypto_utils boringssl pthread)
+
+add_executable(lpdump)
+target_sources(lpdump PRIVATE
+    "partition_tools/lpdump.cc"
+    "partition_tools/dynamic_partitions_device_info.pb.cc"
+    "partition_tools/lpdump_host.cc"
+)
+target_include_directories(lpdump PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
+target_compile_definitions(lpdump PRIVATE -D_FILE_OFFSET_BITS=64)
+target_compile_options(lpdump PRIVATE -std=c++17)
+target_link_libraries(lpdump PRIVATE liblp libsparse ext4_utils zlib base fmtlib liblog libcrypto_utils boringssl libjsonpb protobuf pthread)
+
 #${CPP} -std=c++17 -I../lib/include ${CFLAGS} -D_FILE_OFFSET_BITS=64 -o "../bin/$ARCH/lpmake"   lpmake.cc   ../lib/lib/liblp.a ../lib/lib/libsparse.a ../lib/lib/libext4_utils.a ../lib/lib/libz.a ../lib/lib/libbase.a ../lib/lib/fmtlib.a ../lib/lib/liblog.a ../lib/lib/libcrypto_utils.a ../lib/lib/libcrypto.a -lpthread ${LDFLAGS}
 #${CPP} -std=c++17 -I../lib/include ${CFLAGS} -D_FILE_OFFSET_BITS=64 -o "../bin/$ARCH/lpadd"    lpadd.cc    ../lib/lib/liblp.a ../lib/lib/libsparse.a ../lib/lib/libext4_utils.a ../lib/lib/libz.a ../lib/lib/libbase.a ../lib/lib/fmtlib.a ../lib/lib/liblog.a ../lib/lib/libcrypto_utils.a ../lib/lib/libcrypto.a -lpthread ${LDFLAGS}
 #${CPP} -std=c++17 -I../lib/include ${CFLAGS} -D_FILE_OFFSET_BITS=64 -o "../bin/$ARCH/lpflash"  lpflash.cc  ../lib/lib/liblp.a ../lib/lib/libsparse.a ../lib/lib/libext4_utils.a ../lib/lib/libz.a ../lib/lib/libbase.a ../lib/lib/fmtlib.a ../lib/lib/liblog.a ../lib/lib/libcrypto_utils.a ../lib/lib/libcrypto.a -lpthread ${LDFLAGS}

diff --git a/lib/boringssl/CMakeLists.txt b/lib/boringssl/CMakeLists.txt
index 497a5d5..73b729d 100644 (file)
--- a/lib/boringssl/CMakeLists.txt
+++ b/lib/boringssl/CMakeLists.txt
@@ -4,7 +4,7 @@ project(boringssl VERSION 1.0.0 DESCRIPTION "boringssl")
 
 list(APPEND ARCH_SOURCES "")
 
-if(NOT DEFINED ARCH OR ARCH STREQUAL x86_64)
+if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
 list(APPEND ARCH_SOURCES
     "linux-x86_64/crypto/chacha/chacha-x86_64.S"
     "linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S"
@@ -28,7 +28,7 @@ list(APPEND ARCH_SOURCES
     "linux-x86_64/crypto/test/trampoline-x86_64.S"
     "src/crypto/hrss/asm/poly_rq_mul.S"
 )
-elseif(ARCH STREQUAL "arm7vl" OR ARCH STREQUAL arm7hf)
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm7vl" OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm7hf)
 list(APPEND ARCH_SOURCES
         "linux-arm/crypto/chacha/chacha-armv4.S"
         "linux-arm/crypto/fipsmodule/aes-armv4.S"
@@ -45,7 +45,7 @@ list(APPEND ARCH_SOURCES
         "src/crypto/curve25519/asm/x25519-asm-arm.S"
         "src/crypto/poly1305/poly1305_arm_asm.S"
     )
-elseif(ARCH STREQUAL "aarch64")
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 list(APPEND ARCH_SOURCES
     "linux-aarch64/crypto/chacha/chacha-armv8.S"
     "linux-aarch64/crypto/fipsmodule/aesv8-armx64.S"
@@ -58,7 +58,7 @@ list(APPEND ARCH_SOURCES
     "linux-aarch64/crypto/fipsmodule/vpaes-armv8.S"
     "linux-aarch64/crypto/test/trampoline-armv8.S"
 )
-elseif(ARCH STREQUAL "i686")
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
 list(APPEND ARCH_SOURCES
       "linux-x86/crypto/chacha/chacha-x86.S"
       "linux-x86/crypto/fipsmodule/aes-586.S"

diff --git a/toolchain.make b/toolchain.make
new file mode 100644 (file)
index 0000000..98b1902
--- /dev/null
+++ b/toolchain.make
@@ -0,0 +1,13 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+
+#set(CMAKE_SYSROOT /home/devel/rasp-pi-rootfs)
+#set(CMAKE_STAGING_PREFIX /home/devel/stage)
+
+set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
+set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
\ No newline at end of file