diff options
Diffstat (limited to '')
| -rw-r--r-- | src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ampl-mp/fix-arm-build.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ampl-mp/fix-arm-build.patch b/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ampl-mp/fix-arm-build.patch new file mode 100644 index 000000000..443cdc457 --- /dev/null +++ b/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ampl-mp/fix-arm-build.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92089a3..d4c6762 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,9 +257,15 @@ if (CMAKE_CROSSCOMPILING) + COMMAND ${CMAKE_COMMAND} -E echo + "warning: cannot re-generate ${MP_EXPR_INFO_FILE}") + else () ++ if (ARITHCHK_EXEC) ++ add_custom_command(OUTPUT ${MP_EXPR_INFO_FILE} ++ COMMAND ${WINE} ${ARITHCHK_EXEC} ${MP_EXPR_INFO_FILE} ++ DEPENDS gen-expr-info) ++ else() + add_custom_command(OUTPUT ${MP_EXPR_INFO_FILE} + COMMAND ${WINE} $<TARGET_FILE:gen-expr-info> ${MP_EXPR_INFO_FILE} + DEPENDS gen-expr-info) ++ endif() + endif () + + add_prefix(MP_HEADERS include/mp/ +@@ -359,3 +365,4 @@ endif() + install(DIRECTORY include/mp DESTINATION include) + install(TARGETS mp DESTINATION lib RUNTIME DESTINATION bin) + install(FILES LICENSE.rst DESTINATION share/mp) ++install(TARGETS gen-expr-info RUNTIME DESTINATION bin) +\ No newline at end of file +diff --git a/src/amplsig/CMakeLists.txt b/src/amplsig/CMakeLists.txt +index 81312e9..f44c847 100644 +--- a/src/amplsig/CMakeLists.txt ++++ b/src/amplsig/CMakeLists.txt +@@ -14,6 +14,6 @@ find_library(WS2_32_LIBRARY Ws2_32 + PATHS ${WIN_LIBRARY_DIR} NO_DEFAULT_PATH) + if (WS2_32_LIBRARY) + add_ampl_library(amplsig amplsig.cc) +- message(WS2_32_LIBRARY ${WS2_32_LIBRARY}) +- target_link_libraries(amplsig mp ${WS2_32_LIBRARY}) ++ message(WS2_32_LIBRARY ws2_32) ++ target_link_libraries(amplsig mp ws2_32) + endif () |