[libpq][spdk-ipsec] Rebuild to correct baseline (#10445)

* [spdk-ipsec] Modernize, cleanup, and mark unsupported on non-Linux

* [libpq] Remove stray whitespace; force rebuild

4 files changed, 27 insertions, 38 deletions

diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 2ef9309a2..bd012fcb1 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_TARGET_IS_UWP)
-    message(FATAL_ERROR "${PORT} currently only supports being built for desktop")
-endif()
-
 macro(feature_unsupported)
     foreach(_feat ${ARGN})
         if("${FEATURES}" MATCHES "${_feat}")
@@ -36,7 +32,7 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 231a0b5c181c33cb01c3f39de1802319b79eceec6997935ab8605dea1f4583a52d0d16e5a70fcdeea313462f062503361d543433ee03d858ba332c72a665f696
 )
 
-set(PATCHES  
+set(PATCHES
         patches/windows/install.patch
         patches/windows/win_bison_flex.patch
         patches/windows/openssl_exe_path.patch
@@ -62,7 +58,6 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES ${PATCHES}
-
 )
 unset(buildenv_contents)
 # Get paths to required programs
@@ -104,7 +99,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     file(GLOB SOURCE_FILES ${SOURCE_PATH}/*)
     foreach(_buildtype ${port_config_list})
         # Copy libpq sources.
-        message(STATUS "Copying libpq source files to ${BUILDPATH_${_buildtype}}...")            
+        message(STATUS "Copying libpq source files to ${BUILDPATH_${_buildtype}}...")
         foreach(SOURCE_FILE ${SOURCE_FILES})
             file(COPY ${SOURCE_FILE} DESTINATION "${BUILDPATH_${_buildtype}}")
         endforeach()
@@ -208,8 +203,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
         )
         message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done")
     endforeach()
-    
-    
+
+
     message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...")
     #Cleanup
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@@ -256,8 +251,8 @@ else()
             --with-libraries=${CURRENT_INSTALLED_DIR}/debug/lib
             --enable-debug
     )
-    
-    vcpkg_install_make()    
+
+    vcpkg_install_make()
     # instead?
     #    make -C src/include install
     #    make -C src/interfaces install
diff --git a/ports/spdk-ipsec/CMakeLists.txt b/ports/spdk-ipsec/CMakeLists.txt
index 4d778eb30..fb02b164b 100644
--- a/ports/spdk-ipsec/CMakeLists.txt
+++ b/ports/spdk-ipsec/CMakeLists.txt
@@ -27,7 +27,7 @@ ENDIF ()
 
 SET(MAKE_FLAGS)
 
-IF (EXEC_ENV STREQUAL Windows)
+IF (EXEC_ENV STREQUAL "Windows")
     LIST(APPEND MAKE_FLAGS /f win_x64.mak)
 ENDIF ()
 
@@ -35,7 +35,7 @@ IF (CMAKE_BUILD_TYPE STREQUAL Debug)
     LIST(APPEND MAKE_FLAGS DEBUG=y)
 ENDIF ()
 
-IF (LIBRARY_LINKAGE STREQUAL "static")
+IF (NOT BUILD_SHARED_LIBS)
     LIST(APPEND MAKE_FLAGS SHARED=n)
 ENDIF ()
 
@@ -47,12 +47,10 @@ ADD_CUSTOM_TARGET(ipsec-mb ALL
                   )
 
 SET(LIB_PATH ${CMAKE_SOURCE_DIR}/)
-IF (LIBRARY_LINKAGE STREQUAL "dynamic")
+IF(BUILD_SHARED_LIBS)
     STRING(APPEND LIB_PATH libIPSec_MB.so)
-ELSEIF (LIBRARY_LINKAGE STREQUAL "static")
-    STRING(APPEND LIB_PATH libIPSec_MB.a)
 ELSE ()
-    MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}")
+    STRING(APPEND LIB_PATH libIPSec_MB.a)
 ENDIF ()
 INSTALL(FILES ${LIB_PATH}
         DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/)
diff --git a/ports/spdk-ipsec/CONTROL b/ports/spdk-ipsec/CONTROL
index 7adb9c4c9..3b8259451 100644
--- a/ports/spdk-ipsec/CONTROL
+++ b/ports/spdk-ipsec/CONTROL
@@ -1,4 +1,4 @@
 Source: spdk-ipsec
 Version: 20180711
 Description: SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library
-Supports: x64
+Supports: x64 & linux
diff --git a/ports/spdk-ipsec/portfile.cmake b/ports/spdk-ipsec/portfile.cmake
index d91b6d0e7..3ed53c258 100644
--- a/ports/spdk-ipsec/portfile.cmake
+++ b/ports/spdk-ipsec/portfile.cmake
@@ -1,12 +1,10 @@
-INCLUDE(vcpkg_common_functions)
-
 IF (NOT VCPKG_CMAKE_SYSTEM_NAME)
     SET(EXEC_ENV "Windows")
 ELSE ()
     SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}")
 ENDIF ()
 
-IF (NOT EXEC_ENV STREQUAL "Linux")
+IF (NOT VCPKG_TARGET_IS_LINUX)
     MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports Linux/Windows platforms")
     MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows")
 ENDIF ()
@@ -18,36 +16,34 @@ ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 ENDIF ()
 
 VCPKG_FROM_GITHUB(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO spdk/intel-ipsec-mb
-        REF spdk
-        SHA512 037fc382d9aa87b6645309f29cb761a584ed855c583638c9e27b5b7200ceb2ae21ad5adcc7c92b2b1d1387186a7fd2b5ae22f337a8f52dea3f6c35d8f90b42bd
-        HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO spdk/intel-ipsec-mb
+    REF spdk
+    SHA512 037fc382d9aa87b6645309f29cb761a584ed855c583638c9e27b5b7200ceb2ae21ad5adcc7c92b2b1d1387186a7fd2b5ae22f337a8f52dea3f6c35d8f90b42bd
+    HEAD_REF master
 )
 
 VCPKG_FIND_ACQUIRE_PROGRAM(NASM)
 
-EXEC_PROGRAM(${NASM}
-             ARGS -v
-             OUTPUT_VARIABLE NASM_OUTPUT
-             )
-STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1"
-       NASM_VERSION
-       ${NASM_OUTPUT})
+execute_process(
+    COMMAND "${NASM}" -v
+    OUTPUT_VARIABLE NASM_OUTPUT
+    ERROR_VARIABLE NASM_OUTPUT
+)
+STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1" NASM_VERSION "${NASM_OUTPUT}")
 IF (NASM_VERSION VERSION_LESS 2.13.03)
     MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package")
 ENDIF ()
 
 GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY)
-SET(ENV{PATH} " $ENV{PATH};${NASM_PATH} ")
+vcpkg_add_to_path("${NASM_PATH}")
 
 VCPKG_CONFIGURE_CMAKE(
-        SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
-        PREFER_NINJA
-        OPTIONS
+    SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
+    PREFER_NINJA
+    OPTIONS
         -DSOURCE_PATH=${SOURCE_PATH}
         -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME}
-        -DLIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE}
 )
 
 VCPKG_INSTALL_CMAKE()