Skip to content

[ampl-mp] Update version, separate port ampl-asl and fix arm build#14518

Merged
strega-nil merged 5 commits intomicrosoft:masterfrom
JackBoosY:dev/jack/ampl_mp_update
Nov 12, 2020
Merged

[ampl-mp] Update version, separate port ampl-asl and fix arm build#14518
strega-nil merged 5 commits intomicrosoft:masterfrom
JackBoosY:dev/jack/ampl_mp_update

Conversation

@JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Nov 11, 2020 •
edited by PhoebeHui
Loading

  • Since the component asl in the upstream source is separated, the component is separated as a new port ampl-asl
  • fix arm build
  • update version to latest commit

Related to #14245

@JackBoosY JackBoosY added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:new-port The issue is requesting a new library to be added; consider making a PR! info:internal labels Nov 11, 2020
JackBoosY
JackBoosY commented Nov 11, 2020
View reviewed changes
JackBoosY
JackBoosY commented Nov 11, 2020
View reviewed changes
ports/ampl-asl/install-extra-headers.patch
endif()

install(FILES ${ASL_HEADERS} ${ASL_SOURCE_DIR}/opcode.hd ${ASL_SOURCE_DIR}/r_opn.hd
+ ${GENERATED_INCLUDE_DIR}/stdio1.h ${GENERATED_INCLUDE_DIR}/arith.h
Copy link
Contributor Author

@JackBoosY JackBoosY Nov 11, 2020

Choose a reason for hiding this comment

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

Already open a PR to upstream: ampl/asl#4

JackBoosY
JackBoosY commented Nov 11, 2020
View reviewed changes
ports/ampl-asl/fix-crt-linkage.patch
if(MSVC)
target_compile_options(${name} PRIVATE
- /wd4013 /wd4018 /wd4101 /wd4244 /wd4273 /wd4267 /wd4996 /MT$<$<CONFIG:Debug>:d>)
+ /wd4013 /wd4018 /wd4101 /wd4244 /wd4273 /wd4267 /wd4996)
Copy link
Contributor Author

@JackBoosY JackBoosY Nov 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Use CRT linkage in C_FLAGS/CXX_FLAGS set by vcpkg:

vcpkg/scripts/toolchains/windows.cmake

Lines 8 to 14 in 8de4ee8

if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD")
elseif(VCPKG_CRT_LINKAGE STREQUAL "static")
set(VCPKG_CRT_LINK_FLAG_PREFIX "/MT")
else()
message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"")
endif()

@JackBoosY JackBoosY mentioned this pull request Nov 11, 2020
Merged
@JackBoosY JackBoosY requested a review from PhoebeHui November 11, 2020 09:58
JackBoosY
JackBoosY commented Nov 12, 2020
View reviewed changes
@PhoebeHui PhoebeHui added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Nov 12, 2020
@strega-nil strega-nil merged commit bf482a9 into microsoft:master Nov 12, 2020
@JackBoosY JackBoosY deleted the dev/jack/ampl_mp_update branch November 13, 2020 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PhoebeHui PhoebeHui PhoebeHui approved these changes

Assignees

@PhoebeHui PhoebeHui

Labels

category:new-port The issue is requesting a new library to be added; consider making a PR! category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@JackBoosY @PhoebeHui @strega-nil