diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-10-12 20:27:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 11:27:43 -0700 |
| commit | 5fb4257c3c7ff24b676dc379adbab0e9a668e42d (patch) | |
| tree | b77b81e10fc859d3aef16be888253e7b3ebbc836 | |
| parent | 677eae74c020ff36842ce2fa1a8e50387a359038 (diff) | |
| download | vcpkg-5fb4257c3c7ff24b676dc379adbab0e9a668e42d.tar.gz vcpkg-5fb4257c3c7ff24b676dc379adbab0e9a668e42d.zip | |
[boost-modular-build-helper] Fixup mingw lib names (#20576)
* Fixup mingw lib names on windows
* Update versions
* Bump boost-modular-build-helper port-version.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 14 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/vcpkg.json | 2 | ||||
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 2 | ||||
| -rw-r--r-- | versions/b-/boost-modular-build-helper.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
5 files changed, 22 insertions, 3 deletions
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 4e7dfb456..8d082b26b 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -130,6 +130,20 @@ function(boost_modular_build) file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
endif()
endforeach()
+ # Similar for mingw
+ file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*-mgw10-*.a" "${CURRENT_PACKAGES_DIR}/lib/*-mgw10-*.a")
+ foreach(LIB IN LISTS INSTALLED_LIBS)
+ get_filename_component(OLD_FILENAME "${LIB}" NAME)
+ get_filename_component(DIRECTORY_OF_LIB_FILE "${LIB}" DIRECTORY)
+ string(REGEX REPLACE "-mgw[0-9]+-.*[0-9](\\.dll\\.a|\\.a)$" "\\1" NEW_FILENAME "${OLD_FILENAME}")
+ if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
+ # nothing to do
+ elseif(EXISTS "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}")
+ file(REMOVE "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
+ else()
+ file(RENAME "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}" "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}")
+ endif()
+ endforeach()
# boost-regex[icu] and boost-locale[icu] generate has_icu.lib
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib")
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index e81e9a0fc..71d528590 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 1, + "port-version": 2, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 7a32a0a8c..a626daf34 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -28,7 +28,7 @@ $portVersions = @{ "boost-config" = 2;
"boost-gil" = 1;
"boost-iostreams" = 1;
- "boost-modular-build-helper" = 1;
+ "boost-modular-build-helper" = 2;
"boost-odeint" = 1;
"boost-python" = 1;
"boost-process" = 2;
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 867e62be3..7985f1f49 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9795fd3f465461fea28201a773909b6fd0e3400b", + "version": "1.77.0", + "port-version": 2 + }, + { "git-tree": "c076291c3d44f7cea167e469748ead6270e1c424", "version": "1.77.0", "port-version": 1 diff --git a/versions/baseline.json b/versions/baseline.json index 25a33f202..16ea1895c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -810,7 +810,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 1 + "port-version": 2 }, "boost-move": { "baseline": "1.77.0", |