aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorIlya Arzhannikov <iarzhannikov@artec-group.com>2021-01-26 00:52:09 +0100
committerGitHub <noreply@github.com>2021-01-25 15:52:09 -0800
commit1d415e8dc3afef0ae85b4d00ea56013b2f26bb46 (patch)
treed6b43baf49e98ad558f550357fe4b8df57928271 /versions
parentdbf5193ebbc3e34b8035bf5012d7e836ef39371a (diff)
downloadvcpkg-1d415e8dc3afef0ae85b4d00ea56013b2f26bb46.tar.gz
vcpkg-1d415e8dc3afef0ae85b4d00ea56013b2f26bb46.zip
[boost-locale] android build (#15606)
* pass additional link flags to b2 * configure boost-locale for android * build libiconv for android * Bump port version * bump port version * Update CONTROL * new_ci_checks and versions * add versions again * fix pr review * fix pr review. version * bump versions Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com> Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/b-/boost-locale.json2
-rw-r--r--versions/b-/boost-modular-build-helper.json5
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/l-/libiconv.json5
4 files changed, 13 insertions, 3 deletions
diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json
index c5b917b53..d5e2d017f 100644
--- a/versions/b-/boost-locale.json
+++ b/versions/b-/boost-locale.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "88631ecdc11e6ba3b30ee058381a62cf02a0a816",
+ "git-tree": "8a188d3cd40ba95cf241deda044c44d5426185bd",
"version-string": "1.75.0",
"port-version": 0
},
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index 52819f681..a44a263e4 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b261a1bd3ff03916f10c4a157b670c3c4e7e7326",
+ "version-string": "1.75.0",
+ "port-version": 4
+ },
+ {
"git-tree": "39acb181b681e8ac20ff594d3ac1782bfbb37ba2",
"version-string": "1.75.0",
"port-version": 3
diff --git a/versions/baseline.json b/versions/baseline.json
index f898dce80..3b18e13c2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -674,7 +674,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.75.0",
- "port-version": 3
+ "port-version": 4
},
"boost-move": {
"baseline": "1.75.0",
@@ -3014,7 +3014,7 @@
},
"libiconv": {
"baseline": "1.16",
- "port-version": 7
+ "port-version": 8
},
"libics": {
"baseline": "1.6.4",
diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json
index c8d493eac..f198b5346 100644
--- a/versions/l-/libiconv.json
+++ b/versions/l-/libiconv.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1190548d712c0ed8699e3b82e16f6b070a5154c9",
+ "version-string": "1.16",
+ "port-version": 8
+ },
+ {
"git-tree": "2ca525bd3d388ec908ab2ec26bdccb12a990a26d",
"version-string": "1.16",
"port-version": 7