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

[vcpkg baseline][osgearth/gdal] Re-fix dependency gdal #16904

Merged
merged 20 commits into from
Mar 28, 2021
Merged

[vcpkg baseline][osgearth/gdal] Re-fix dependency gdal #16904

merged 20 commits into from
Mar 28, 2021

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Mar 26, 2021 •
edited
Loading

The gdal requires freexl on non-Windows:

/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libgdal.a(ogrxlsdatasource.o): In function `OGRXLSDataSource::~OGRXLSDataSource()':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp:66: undefined reference to `freexl_close'
/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libgdal.a(ogrxlsdatasource.o): In function `OGRXLSDataSource::Open(char const*, int)':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp:147: undefined reference to `freexl_get_info'
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp:152: undefined reference to `freexl_select_active_worksheet'
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp:155: undefined reference to `freexl_get_worksheet_name'
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp:160: undefined reference to `freexl_worksheet_dimensions'
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp:171: undefined reference to `freexl_close'
/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libgdal.a(ogrxlsdatasource.o): In function `OGRXLSDataSource::GetXLSHandle()':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp:186: undefined reference to `freexl_open'
/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libgdal.a(ogrxlslayer.o): In function `OGRXLSLayer::DetectHeaderLine(void const*)':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp:95: undefined reference to `freexl_get_cell_value'
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp:105: undefined reference to `freexl_get_cell_value'
/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libgdal.a(ogrxlslayer.o): In function `OGRXLSLayer::DetectColumnTypes(void const*, int*)':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp:139: undefined reference to `freexl_get_cell_value'
/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libgdal.a(ogrxlslayer.o): In function `OGRXLSLayer::GetLayerDefn()':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp:209: undefined reference to `freexl_select_active_worksheet'
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp:236: undefined reference to `freexl_get_cell_value'
/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libgdal.a(ogrxlslayer.o): In function `OGRXLSLayer::GetNextRawFeature()':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp:317: undefined reference to `freexl_select_active_worksheet'
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp:324: undefined reference to `freexl_get_cell_value'

Fix this.

Since #16088 or #15808 doesn't merged, fix this issue in osgearth temporary.

@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Mar 26, 2021
@JackBoosY JackBoosY requested a review from vicroms March 26, 2021 12:44
@JackBoosY JackBoosY changed the title [vcpkg baseline][osgearth] Re-fix dependency gdal [vcpkg baseline][osgearth/gdal] Re-fix dependency gdal Mar 26, 2021
@JackBoosY
Copy link
Contributor Author

Done.

This was referenced Mar 26, 2021
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Closed
Merged
Merged
Merged
@JackBoosY
Copy link
Contributor Author

@vicroms Ping for merge this PR.

ras0219-msft
ras0219-msft requested changes Mar 26, 2021
View reviewed changes
Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

Since this is a stop-gap, we should approach this with the minimal change and simply disable freexl as a dependency. This will avoid needing to change osgearth as well.

ports/gdal/portfile.cmake Outdated Show resolved Hide resolved
ports/gdal/vcpkg.json Outdated Show resolved Hide resolved
@vicroms vicroms merged commit 6d9ed56 into microsoft:master Mar 28, 2021
@wrobelda wrobelda mentioned this pull request Mar 28, 2021
Merged
@PhoebeHui PhoebeHui mentioned this pull request Mar 28, 2021
Closed
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Mar 28, 2021
@Jimmy-Hu
Merge pull request #576 from microsoft/master
805124c 
[vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (microsoft#16904)
@JackBoosY JackBoosY deleted the dev/jack/fix_baseline_20210326 branch March 29, 2021 17:03
ras0219-msft added a commit to ras0219-msft/vcpkg that referenced this pull request May 6, 2021
@ras0219-msft
[protobuf] Fix regression introduced in microsoft#16904
3b245c5
strega-nil-ms pushed a commit that referenced this pull request May 6, 2021
@ras0219-msft @ras0219
[vcpkg] Update vcpkg tool version 2021-05-05 (#17689)
4e83da0 
* [vcpkg] Update vcpkg tool version 2021-05-05

* [vcpkg] Hotfix bug in microsoft/vcpkg-tool#34

* [vcpkg-ci] Ignore results from non-target triplets

* [protobuf] Fix regression introduced in #16904

* [vcpkg] Fix bug where 'staticcrt' was ignored

Co-authored-by: Robert Schumacher <ras0219@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vicroms vicroms Awaiting requested review from vicroms

@ras0219-msft ras0219-msft Awaiting requested review from ras0219-msft

Assignees

@PhoebeHui PhoebeHui

Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JackBoosY @ras0219-msft @vicroms @PhoebeHui