diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-15 23:49:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 15:49:04 -0700 |
| commit | ca35082c483ef08aa1be80aad715004232a3abc5 (patch) | |
| tree | ba28f5ea8d4d6551e1213525ebae6a95ec8d5a18 | |
| parent | 24625921aa35488b26192f5837a56352a84ba756 (diff) | |
| download | vcpkg-ca35082c483ef08aa1be80aad715004232a3abc5.tar.gz vcpkg-ca35082c483ef08aa1be80aad715004232a3abc5.zip | |
[ace] Upgrade to 7.0.1 (#16708)
* [ace] 7.0.0
* Make sure C++11 is enabled on macosx
* ports/ace/portfile.cmake:
* [ace] Upgrade to 7.0.1
* [ace] Revert workaround for macosx, not needed anymore
* [ace] 7.0.1
* [ace] 7.0.1
| -rw-r--r-- | ports/ace/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ace/portfile.cmake | 12 | ||||
| -rw-r--r-- | versions/a-/ace.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 4d59260e0..1e041b8e1 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 7.0.0 +Version: 7.0.1 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment Port-Version: 0 diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index bed80493e..fa6da34d5 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,7 +1,7 @@ # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -set(ACE_VERSION 7.0.0) +set(ACE_VERSION 7.0.1) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) @@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" FILENAME ACE-TAO-${ACE_VERSION}.zip - SHA512 9b99a07bfc80d616843b2a6f8f9a0fc0868fefcb98a1f57f04cc624f39ad9162043bb29d886eda2162143a321b434b8496717b005fa314acbc5403a37a965df6 + SHA512 0f7fb37d85026d75db454176ca0b4820c4e972953c4c5218843b0adc94f2fd0f63a94403028f7bc32e443e70957befb18d256bbd72a0e275f505b5221725c245 ) else() # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" FILENAME ACE-TAO-${ACE_VERSION}.tar.gz - SHA512 731896ae9939702b70d293ced64aae1030ddf7545fba926c99b495a43e37aaacc9c9d91f6aadef0153c128704ba7c8545d9b81f9fa0f58de4939e3be4eab1103 + SHA512 881343a7f23552d699c22654e62cb926433938bc5afae8d785be2ca0409528b5cc701aecbc97ce16ae42b14a94e73060a347e2c8ee8b44d9e59837b0c0339709 ) endif() else() @@ -26,14 +26,14 @@ else() vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" FILENAME ACE-src-${ACE_VERSION}.zip - SHA512 6b2ddaabaa737bd13d8541d1458ea2f73cbee558f7a294a16078d68e0f294dc09310661ec23ba3077528dfe7340f7040cccc4bd7082025d7b4f3be52d6718769 + SHA512 36ef4f189c777f54f0381a31c1e635155f32576e56ed9a4b6b663d37c3f45057e5a75a0009cf5c73f040c19f5bda364984102d818c3a301d14c2d11917d938a9 ) else(VCPKG_TARGET_IS_WINDOWS) # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" FILENAME ACE-src-${ACE_VERSION}.tar.gz - SHA512 91541eac3c7246e5620ee805c297b80406f2e27e06338f142e40633ec74ef5e18e65164c66225bb8606314b63d6b197c6122927f4300bef4bb88010e8b5571b1 + SHA512 52277899796d1c0c0f70afc48b5557c467ee48003261e5dac775bb02a2191959e54cd5b33f111a9dbcffdc4f473999dda557e52ef409668e30a2e75e2287e243 ) endif() endif() @@ -104,7 +104,7 @@ elseif(VCPKG_TARGET_IS_LINUX) elseif(VCPKG_TARGET_IS_OSX) set(SOLUTION_TYPE gnuace) file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"") - file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "c++11=1\ninclude $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") + file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") endif() if(VCPKG_TARGET_IS_UWP) diff --git a/versions/a-/ace.json b/versions/a-/ace.json index cc4691de4..3aa8c9c4b 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f78fceaf77115253b6aac710881d0d8f705fead6", + "version-string": "7.0.1", + "port-version": 0 + }, + { "git-tree": "fefdf115c09a6996c55262dd9a635647dc7d8440", "version-string": "7.0.0", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index 974ad9f06..c342e35b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -17,7 +17,7 @@ "port-version": 0 }, "ace": { - "baseline": "7.0.0", + "baseline": "7.0.1", "port-version": 0 }, "activemq-cpp": { |