Skip to content

[vcpkg-baseline][unixodbc/nanodbc] Fix unixodbc build failure and set it as a dependency on nanodbc #11613

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

Merged
dan-shaw merged 1 commit into from
Jun 1, 2020
Merged

[vcpkg-baseline][unixodbc/nanodbc] Fix unixodbc build failure and set it as a dependency on nanodbc #11613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ports/nanodbc/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: nanodbc
Version: 2.12.4-7
Version: 2.12.4-8
Homepage: https://github.com/lexicalunit/nanodbc
Description: A small C++ wrapper for the native C ODBC API.
Build-Depends: unixodbc
2 changes: 1 addition & 1 deletion ports/unixodbc/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: unixodbc
Version: 2.3.7
Version: 2.3.7-1
Homepage: https://github.com/lurcher/unixODBC
Description: unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX
Supports: (osx|linux)
1 change: 1 addition & 0 deletions ports/unixodbc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ vcpkg_from_github(
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
COPY_SOURCE
)

vcpkg_install_make()
Expand Down
3 changes: 0 additions & 3 deletions scripts/azure-pipelines/linux/provision-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ sudo apt update
sudo add-apt-repository universe
sudo apt install -y powershell

# Install odbc
sudo apt install -y unixodbc-dev

# Write SMB credentials
sudo mkdir /etc/smbcredentials
smbCredentialFile=/etc/smbcredentials/$StorageAccountName.cred
Expand Down