diff --git a/ports/dmlc/cxx-fix.patch b/ports/dmlc/cxx-fix.patch new file mode 100644 index 00000000000000..4b3f0d3d5860e6 --- /dev/null +++ b/ports/dmlc/cxx-fix.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46aa280..f66b286 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,7 @@ if(USE_AZURE) + endif() + + add_library(dmlc ${SOURCE}) ++target_compile_features(dmlc PUBLIC cxx_std_${CMAKE_CXX_STANDARD}) + + # Sanitizer + if (DMLC_USE_SANITIZER) diff --git a/ports/dmlc/portfile.cmake b/ports/dmlc/portfile.cmake index bae56fc77e00f1..16d819590ab19a 100644 --- a/ports/dmlc/portfile.cmake +++ b/ports/dmlc/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dmlc/dmlc-core - REF d3fd7c5e9b9c280d3081ada3fb62705547c00bf1 - SHA512 6887d52ddd00949866c27bea3c860abb8a7ecf61feeac79d67d260635e9c3e490b6f0538cbc0ccc1f03e90ab4094bfc0fcb938adb3fb5afe9fea813d47cc7430 - HEAD_REF master + REF dfd9365264a060a5096734b7d892e1858b6d2722 + SHA512 0dc2ecd3c981d88de27bf5184f7b380261335c474934d0db59028adfe75f6b3ee2da5b831135acfaad7943acb3eaa7007c0faf0f14e63b39865354898f64fcea + HEAD_REF main + PATCHES + cxx-fix.patch # from https://github.com/dmlc/dmlc-core/pull/676 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,20 +21,19 @@ else() set(DMLC_FORCE_SHARED_CRT OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DDMLC_FORCE_SHARED_CRT=${DMLC_FORCE_SHARED_CRT} -DUSE_OPENMP=${ENABLE_OPENMP} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dmlc) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dmlc) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dmlc/vcpkg.json b/ports/dmlc/vcpkg.json index d5f74b3d7791c5..22652c3ce44496 100644 --- a/ports/dmlc/vcpkg.json +++ b/ports/dmlc/vcpkg.json @@ -1,10 +1,20 @@ { "name": "dmlc", - "version-date": "2019-08-12", - "port-version": 7, + "version-date": "2022-06-22", "description": "DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.", "homepage": "https://github.com/dmlc/dmlc-core", + "license": "Apache-2.0", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "openmp": { "description": "Build with openmp" diff --git a/versions/baseline.json b/versions/baseline.json index 82608314061564..71ffd318f7a4ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1989,8 +1989,8 @@ "port-version": 2 }, "dmlc": { - "baseline": "2019-08-12", - "port-version": 7 + "baseline": "2022-06-22", + "port-version": 0 }, "docopt": { "baseline": "2018-11-01", diff --git a/versions/d-/dmlc.json b/versions/d-/dmlc.json index 72b091b613a27f..5c83422ee6ffe6 100644 --- a/versions/d-/dmlc.json +++ b/versions/d-/dmlc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23dbee1949340c7bc6377d1acb7007faf7ba2247", + "version-date": "2022-06-22", + "port-version": 0 + }, { "git-tree": "2d1ce501d0c9ed32e6de5f73290635b259f67364", "version-date": "2019-08-12",