1diff -urN -x .git orig/cmake/BundledOSSPUUID.cmake patched/cmake/BundledOSSPUUID.cmake 2--- orig/cmake/BundledOSSPUUID.cmake 2020-08-07 21:58:34.660773928 +0900 3+++ patched/cmake/BundledOSSPUUID.cmake 2020-08-07 22:05:57.404772993 +0900 4@@ -22,7 +22,9 @@ 5 6 # Define patch step 7 find_package(Patch REQUIRED) 8- set(PC "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch") 9+ set(PATCH1 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch") 10+ set(PATCH2 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch") 11+ set(PATCH3 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch") 12 13 # Define byproducts 14 set(BYPRODUCTS "lib/libuuid.a" 15@@ -35,7 +37,9 @@ 16 ENDFOREACH(BYPRODUCT) 17 18 # Build project 19- set(CONFIGURE_COMMAND ./configure "CFLAGS=-fPIC" "CXXFLAGS=-fPIC" --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install") 20+ set(CONFIGURE_COMMAND ac_cv_va_copy=C99 ./configure CFLAGS=-fPIC CXXFLAGS=-fPIC --host=${HOST_SYS} 21+ --with-cxx --without-perl --without-php --without-pgsql 22+ --prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install) 23 string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type) 24 if(NOT build_type MATCHES debug) 25 list(APPEND CONFIGURE_COMMAND --enable-debug=yes) 26@@ -52,8 +56,8 @@ 27 UPDATE_COMMAND "" 28 INSTALL_COMMAND make install 29 BUILD_BYPRODUCTS ${OSSPUUID_LIBRARIES_LIST} 30- CONFIGURE_COMMAND "" 31- PATCH_COMMAND ${PC} && ${CONFIGURE_COMMAND} 32+ CONFIGURE_COMMAND ${CONFIGURE_COMMAND} 33+ PATCH_COMMAND ${PATCH1} && ${PATCH2} && ${PATCH3} 34 STEP_TARGETS build 35 EXCLUDE_FROM_ALL TRUE 36 ) 37