Skip to content

[boost-modular-build-helper] Fixup mingw lib names #20576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 4 commits into from
Oct 12, 2021
Merged

[boost-modular-build-helper] Fixup mingw lib names #20576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e301d60
Fixup mingw lib names on windows
dg0yt Oct 7, 2021
e6f7419
Update versions
dg0yt Oct 7, 2021
79096f5
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Oct 12, 2021
8091b0b
Bump boost-modular-build-helper port-version.
BillyONeal Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ports/boost-modular-build-helper/boost-modular-build.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Contributor Author

@dg0yt dg0yt Oct 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than in the regex below, the glob uses literal -mgw10-. I'm not sure what the 10 stands for. Maybe gcc version? It might be more robust to use -mgw*- instead. The regex will still limit the cases of renaming.

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")
Expand Down
2 changes: 1 addition & 1 deletion ports/boost-modular-build-helper/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/boost/generate-ports.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $portVersions = @{
"boost" = 1;
"boost-config" = 2;
"boost-iostreams" = 1;
"boost-modular-build-helper" = 1;
"boost-modular-build-helper" = 2;
"boost-odeint" = 1;
"boost-python" = 1;
"boost-process" = 2;
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost-modular-build-helper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9795fd3f465461fea28201a773909b6fd0e3400b",
"version": "1.77.0",
"port-version": 2
},
{
"git-tree": "c076291c3d44f7cea167e469748ead6270e1c424",
"version": "1.77.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.77.0",
"port-version": 1
"port-version": 2
},
"boost-move": {
"baseline": "1.77.0",
Expand Down