diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-06-10 17:01:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 17:01:54 -0700 |
| commit | 3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0 (patch) | |
| tree | 05cb5e1338150601bfba7446839dc02863c96add /ports/avro-c | |
| parent | d962dc7d651b563bed089f4bf9056003ebb7fe1c (diff) | |
| download | vcpkg-3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0.tar.gz vcpkg-3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0.zip | |
[many ports] Updates 2019.05.24 (#6618)
* [many ports] Updates 2019.05.24
* Update SHA512 and resolve conflict for ebml and matroska
* [avro-c]Fix build error caused by jansson upgrades.
* [xxhash]Update to the next version to fix build error.(xxhash issue:#179)
* Fix failures and undo asio
* [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches
* Update REF
* Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes
* [flann, fastcdr] Fix old patches and build error.
* [flann, fastcdr] Fix build error.
* Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes
* [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error.
* fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi
* fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers
* undo libmupdf forge kd-soap qca
* [mosquitto] Fix installation of import libs
* [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes
* [fastcdr] Minimize patch
* [many ports] Revert trivial changes
* [libyaml] Switch to non-dist tag
* [sqlite-modern-cpp] Track master due to infrequent release
* [nano-signal-slot] Revert downgrade
* [openvpn3] Bump control version to account for portfile change
* [sqlite-modern-cpp] Fixup wrong hash
* [mosquitto] Commit missing patch
Diffstat (limited to 'ports/avro-c')
| -rw-r--r-- | ports/avro-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/avro-c/fix-build-error.patch | 20 | ||||
| -rw-r--r-- | ports/avro-c/portfile.cmake | 10 |
3 files changed, 25 insertions, 7 deletions
diff --git a/ports/avro-c/CONTROL b/ports/avro-c/CONTROL index 5bcf16fe5..527090f0d 100644 --- a/ports/avro-c/CONTROL +++ b/ports/avro-c/CONTROL @@ -1,4 +1,4 @@ Source: avro-c -Version: 1.8.2-1 +Version: 1.8.2-2 Description: Apache Avro is a data serialization system Build-Depends: jansson, liblzma, zlib diff --git a/ports/avro-c/fix-build-error.patch b/ports/avro-c/fix-build-error.patch new file mode 100644 index 000000000..6e07310fa --- /dev/null +++ b/ports/avro-c/fix-build-error.patch @@ -0,0 +1,20 @@ +diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt +index c21f1ce..accb0e3 100644 +--- a/lang/c/src/CMakeLists.txt ++++ b/lang/c/src/CMakeLists.txt +@@ -85,13 +85,13 @@ source_group(Avro FILES ${AVRO_SRC}) + string(REPLACE ":" "." LIBAVRO_DOT_VERSION ${LIBAVRO_VERSION}) + + add_library(avro-static STATIC ${AVRO_SRC}) +-target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) ++target_link_libraries(avro-static jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) + set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro) + + if (NOT WIN32) + # TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL + add_library(avro-shared SHARED ${AVRO_SRC}) +-target_link_libraries(avro-shared ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) ++target_link_libraries(avro-shared jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) + set_target_properties(avro-shared PROPERTIES + OUTPUT_NAME avro + SOVERSION ${LIBAVRO_DOT_VERSION}) diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake index d868738df..ee0b6f7ca 100644 --- a/ports/avro-c/portfile.cmake +++ b/ports/avro-c/portfile.cmake @@ -13,14 +13,12 @@ vcpkg_from_github( REF release-1.8.2 SHA512 a48cc353aadd45ad2c8593bf89ec3f1ddb0fcd364b79dd002a60a54d49cab714b46eee8bd6dc47b13588b9eead49c754dfe05f6aff735752fca8d2cd35ae8649 HEAD_REF master + PATCHES + avro.patch + avro-pr-217.patch + fix-build-error.patch # Since jansson updated, use jansson::jansson instead of the macro ${JANSSON_LIBRARIES} ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/avro.patch - ${CMAKE_CURRENT_LIST_DIR}/avro-pr-217.patch) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/lang/c PREFER_NINJA |
