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