diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-02 06:56:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 15:56:10 -0700 |
| commit | 47a883b395121698ea96a119f73a4d24b1315c0e (patch) | |
| tree | c80ab0109335e9dfd4615953000f5a3651bcd1d6 | |
| parent | 1ffc953ab56070984dc9ed34cadd91ec6c0d5218 (diff) | |
| download | vcpkg-47a883b395121698ea96a119f73a4d24b1315c0e.tar.gz vcpkg-47a883b395121698ea96a119f73a4d24b1315c0e.zip | |
[unixodbc/nanodbc] Fix unixodbc build failure and set it as a dependency on nanodbc (#11613)
| -rw-r--r-- | ports/nanodbc/CONTROL | 3 | ||||
| -rw-r--r-- | ports/unixodbc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/unixodbc/portfile.cmake | 1 | ||||
| -rwxr-xr-x | scripts/azure-pipelines/linux/provision-image.sh | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL index a4513d4f6..92097e188 100644 --- a/ports/nanodbc/CONTROL +++ b/ports/nanodbc/CONTROL @@ -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 diff --git a/ports/unixodbc/CONTROL b/ports/unixodbc/CONTROL index c82960153..8ff0ce87b 100644 --- a/ports/unixodbc/CONTROL +++ b/ports/unixodbc/CONTROL @@ -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) diff --git a/ports/unixodbc/portfile.cmake b/ports/unixodbc/portfile.cmake index 31cdf33e8..4ae0fd149 100644 --- a/ports/unixodbc/portfile.cmake +++ b/ports/unixodbc/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG + COPY_SOURCE ) vcpkg_install_make() diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index e71a67a84..55f3ce638 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -46,9 +46,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 |