aboutsummaryrefslogtreecommitdiff
path: root/ports/ignition-modularscripts
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-10-24 22:36:53 -0700
committerGitHub <noreply@github.com>2020-10-24 22:36:53 -0700
commitb97849d25804ca06125f6d311c7139df1339b84c (patch)
tree11c0fca83f90f035d2a348ef3ca04857712f1fa0 /ports/ignition-modularscripts
parent2f731d650f4b5810fede35adda304807daa034df (diff)
downloadvcpkg-b97849d25804ca06125f6d311c7139df1339b84c.tar.gz
vcpkg-b97849d25804ca06125f6d311c7139df1339b84c.zip
[Many Ports] Baseline Fixes for 2020-10-24 CI Build (#14208)
* [libp7client, libp7-baical] Combine identical ports and update to libp7client 5.6. In a recent CI build, we started getting output like: Installing package libp7-baical[core]:x86-windows... The following files are already installed in C:/Dev/vcpkg/installed/x86-windows and are in conflict with libp7-baical:x86-windows Installed by libp7client:x86-windows bin/P7x32.dll bin/P7x32.pdb debug/bin/P7x32d.dll debug/bin/P7x32d.pdb include/P7/GTypes.h include/P7/P7_Client.h include/P7/P7_Cproxy.h include/P7/P7_Extensions.h include/P7/P7_Telemetry.h include/P7/P7_Trace.h It turns out that these ports are identical, they are just different versions of the same library. The libp7-baical version supported more platforms and was simpler, so took that one and updated it to a current version. * [ignition-modularscripts, ignition-msgs1] Attempt to fix intermittent build failures by disabling parallel configure. * Fix several "passing: remove from fail list." * [akali] Disable parallel configure. REGRESSION: akali:x64-windows. If expected, add akali:x64-windows=fail to .\scripts\ci.baseline.txt. Attempts to fix: CMake Error: Could not open file for write in copy operation C:/Dev/vcpkg/buildtrees/akali/src/fc94eb83a9-01654d3f7c.clean/include/akali_config.h.tmp CMake Error: : System Error: Permission denied CMake Error at CMakeLists.txt:20 (configure_file): configure_file Problem configuring file * [nvtt] Devendor libsquish This was regressed by https://github.com/microsoft/vcpkg/pull/13674 REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt. Installing package nvtt[core]:x64-linux... The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux Installed by libsquish:x64-linux debug/lib/libsquishd.a include/squish.h lib/libsquish.a * [knet] Disable parallel configure. REGRESSION: knet:x64-windows. If expected, add knet:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at src/CMakeLists.txt:1 (configure_file): configure_file Problem configuring file * [libnice] Diable parallel configure. REGRESSION: libnice:x64-windows. If expected, add libnice:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at CMakeLists.txt:13 (configure_file): configure_file Problem configuring file
Diffstat (limited to 'ports/ignition-modularscripts')
-rw-r--r--ports/ignition-modularscripts/CONTROL2
-rw-r--r--ports/ignition-modularscripts/ignition_modular_library.cmake17
2 files changed, 10 insertions, 9 deletions
diff --git a/ports/ignition-modularscripts/CONTROL b/ports/ignition-modularscripts/CONTROL
index e52ae90a5..98ceba1af 100644
--- a/ports/ignition-modularscripts/CONTROL
+++ b/ports/ignition-modularscripts/CONTROL
@@ -1,4 +1,4 @@
Source: ignition-modularscripts
Version: 2020-05-16
-Port-Version: 1
+Port-Version: 2
Description: Vcpkg helpers to package ignition libraries
diff --git a/ports/ignition-modularscripts/ignition_modular_library.cmake b/ports/ignition-modularscripts/ignition_modular_library.cmake
index b294c097b..77506bb3b 100644
--- a/ports/ignition-modularscripts/ignition_modular_library.cmake
+++ b/ports/ignition-modularscripts/ignition_modular_library.cmake
@@ -3,6 +3,7 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
OPTIONS -DBUILD_TESTING=OFF
)
@@ -29,13 +30,13 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC
file(COPY ${CMAKE_RELEASE_FILES} DESTINATION
"${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/")
endif()
-
+
# Remove unused files files
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/lib/cmake
${CURRENT_PACKAGES_DIR}/debug/share)
-
+
# Make pkg-config files relocatable
if(NOT IML_DISABLE_PKGCONFIG_INSTALL)
if(VCPKG_TARGET_IS_LINUX)
@@ -97,7 +98,7 @@ endfunction()
## ### CMAKE_PACKAGE_NAME
## The name of the CMake package for the port.
## If not specified, defaults to `ignition-${NAME}${MAJOR_VERSION}`.
-##
+##
## ### DISABLE_PKGCONFIG_INSTALL
## If present, disable installation of .pc pkg-config configuration files.
##
@@ -112,16 +113,16 @@ function(ignition_modular_library)
set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME)
set(multiValueArgs PATCHES)
cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
+
string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION})
list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION)
- # If the REF option is omitted, use the canonical one
+ # If the REF option is omitted, use the canonical one
if(NOT DEFINED IML_REF)
set(IML_REF "ignition-${IML_NAME}${IML_MAJOR_VERSION}_${IML_VERSION}")
endif()
-
- # If the HEAD_REF option is omitted, use the canonical one
+
+ # If the HEAD_REF option is omitted, use the canonical one
if(NOT DEFINED IML_HEAD_REF)
set(IML_HEAD_REF "ign-${IML_NAME}${IML_MAJOR_VERSION}")
endif()
@@ -141,7 +142,7 @@ function(ignition_modular_library)
HEAD_REF ${IML_HEAD_REF}
PATCHES ${IML_PATCHES}
)
-
+
# Build library
ignition_modular_build_library(${IML_NAME} ${IML_MAJOR_VERSION} ${SOURCE_PATH} ${IML_CMAKE_PACKAGE_NAME} ${DEFAULT_CMAKE_PACKAGE_NAME} ${IML_DISABLE_PKGCONFIG_INSTALL})
endfunction()