Skip to content
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

Jump to bottom

[ace] Add patch to fix Visual Studio 2019 16.5 internal compiler error #11369

Merged
merged 22 commits into from
May 27, 2020
Merged

[ace] Add patch to fix Visual Studio 2019 16.5 internal compiler error #11369

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
974ae7b
[ace] Update to 6.5.8
jwillemsen Feb 10, 2020
0f88c1a
Address review comments
jwillemsen Feb 11, 2020
411981f
Put back copy step
jwillemsen Feb 11, 2020
0c31b88
Fixed error
jwillemsen Feb 11, 2020
aeec218
ARM should work, let us try it
jwillemsen Feb 11, 2020
d3d5f66
ARM doesn't work yet, so disable it again
jwillemsen Feb 11, 2020
6b22b90
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 2, 2020
4bc796b
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 23, 2020
1162f9a
Add support for vcpkg of ace on MacOSX
jwillemsen Apr 23, 2020
42ed50c
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 24, 2020
751fb81
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 24, 2020
0b96ccf
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 1, 2020
158f002
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 6, 2020
77ab4e6
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 15, 2020
642a4e1
[ace] Add patch to fix Visual Studio 2019 internal compiler error
jwillemsen May 15, 2020
0bcf649
Attempt to fix apply patches
jwillemsen May 15, 2020
73985a0
[ace] Updated baseline for ace, 4 configurations work again with the …
jwillemsen May 15, 2020
5f8ad22
Address review comments
jwillemsen May 18, 2020
0ea23d3
Revised patch for ACE
jwillemsen May 18, 2020
a22f3e1
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 19, 2020
506ebd5
Merge branch 'master' into jwi-ace-659patch
jwillemsen May 19, 2020
0cecd0f
Update ports/ace/portfile.cmake
strega-nil May 21, 2020
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
2 changes: 1 addition & 1 deletion ports/ace/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: ace
Version: 6.5.9
Version: 6.5.9-1
Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
Description: The ADAPTIVE Communication Environment
Supports: !uwp
Expand Down
5 changes: 5 additions & 0 deletions ports/ace/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/process_manager.patch"
jwillemsen marked this conversation as resolved.
Show resolved Hide resolved
)

jwillemsen marked this conversation as resolved.
Show resolved Hide resolved
set(ACE_ROOT ${SOURCE_PATH})
set(ENV{ACE_ROOT} ${ACE_ROOT})
Expand Down
34 changes: 34 additions & 0 deletions ports/ace/process_manager.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index ee0418b8fca..1eeae31d2a8 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -129,12 +129,12 @@ ACE_Process_Manager::instance (void)
ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
ACE_Process_Manager_cleanup,
0,
- typeid (*ACE_Process_Manager::instance_).name ());
+ typeid (ACE_Process_Manager).name ());
#else
ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
ACE_Process_Manager::cleanup,
0,
- typeid (*ACE_Process_Manager::instance_).name ());
+ typeid (ACE_Process_Manager).name ());
#endif /* ACE_HAS_SIG_C_FUNC */

}
@@ -162,12 +162,12 @@ ACE_Process_Manager::instance (ACE_Process_Manager *tm)
ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
ACE_Process_Manager_cleanup,
0,
- typeid (*ACE_Process_Manager::instance_).name ());
+ typeid (ACE_Process_Manager).name ());
#else
ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
ACE_Process_Manager::cleanup,
0,
- typeid (*ACE_Process_Manager::instance_).name ());
+ typeid (ACE_Process_Manager).name ());
#endif /* ACE_HAS_SIG_C_FUNC */

ACE_Process_Manager::instance_ = tm;
5 changes: 0 additions & 5 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,8 @@
7zip:x64-osx=fail
7zip:x64-uwp=fail
abseil:arm-uwp=fail
# ace is failing because the port's attempt to make yasm available is not succeeding
ace:arm-uwp=fail
ace:arm64-windows=fail
ace:x64-uwp=fail
ace:x64-windows-static=fail
ace:x64-windows=fail
ace:x86-windows=fail
activemq-cpp:x64-windows-static=fail
activemq-cpp:x64-linux=fail
activemq-cpp:x64-osx=fail
Expand Down