WIP

ports/qtshadertools/portfile.cmake

@@ -5,7 +5,7 @@ set(${PORT}_PATCHES)
 
 set(TOOL_NAMES qsb)
 
-file(COPY "${CURRENT_INSTALLED_DIR}/share/Qt6Gui/Qt6QEglFSX11IntegrationPluginTargets.cmake" DESTINATION "${CURRENT_BUILDTREES_DIR}" RENAME "Qt6QEglFSX11IntegrationPluginTargets.cmake.log")
+file(INSTALL "${CURRENT_INSTALLED_DIR}/share/Qt6Gui/Qt6QEglFSX11IntegrationPluginTargets.cmake" DESTINATION "${CURRENT_BUILDTREES_DIR}" RENAME "Qt6QEglFSX11IntegrationPluginTargets.cmake.log")
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      TOOL_NAMES ${TOOL_NAMES}
                      CONFIGURE_OPTIONS

ports/spdk-dpdk/CMakeLists.txt

@@ -35,9 +35,9 @@ FIND_PROGRAM(MAKE make)
 
 SET(DPDK_CFLAGS "-fPIC")
 IF (CMAKE_BUILD_TYPE STREQUAL Debug)
-    STRING(APPEND ${DPDK_CFLAGS} "-O0 -g")
+    STRING(APPEND ${DPDK_CFLAGS} " -O0 -g")
 ENDIF ()
-
+STRING(APPEND ${DPDK_CFLAGS} " -I${NUMA_INCLUDE_DIR}")
 SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN})
 #SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET})
 SET(DPDK_CONFIG "T=${DPDK_TARGET}")

ports/spdk-dpdk/portfile.cmake

@@ -5,33 +5,19 @@ ENDIF ()
 VCPKG_FROM_GITHUB(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO spdk/dpdk
-        REF spdk-18.11
-        SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c
+        REF v21.02
+        SHA512 f2efb5d6907a0ce7c3d2a63d37e10f2e0080a0d21c0555b46d03b800dc85b219cf0d90303035b32193c017d3b07333c91950e0b72265c1d9986e2eba39f3274e
         HEAD_REF master
 )
 
-VCPKG_CONFIGURE_CMAKE(
-        SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
-        PREFER_NINJA
-        OPTIONS
-        -DSOURCE_PATH=${SOURCE_PATH}
-)
+x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES pyelftools )
 
-VCPKG_INSTALL_CMAKE()
+vcpkg_configure_meson(
+        SOURCE_PATH "${SOURCE_PATH}"
+        OPTIONS 
+)
 
-# Headers are symbolic links here, gather all, resolve and copy real files
-FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*")
-SET(REAL_FILES "")
-FOREACH (HEADER ${HEADERS})
-    GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH)
-    LIST(APPEND REAL_FILES "${REAL_FILE}")
-ENDFOREACH ()
+vcpkg_install_meson()
 
-FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk)
-if(NOT VCPKG_BUILD_TYPE)
-    FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
-endif()
-FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
-FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+FILE(INSTALL "${SOURCE_PATH}/license/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/spdk-dpdk/vcpkg.json

@@ -1,10 +1,13 @@
 {
   "name": "spdk-dpdk",
-  "version-date": "2018-11-24",
-  "port-version": 2,
+  "version-date": "2021-02-14",
   "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing",
   "supports": "linux",
   "dependencies": [
-    "libnuma"
+    "libnuma",
+    {
+      "name": "vcpkg-get-python-packages",
+      "host": true
+    }
   ]
 }