diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2020-10-31 03:07:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 12:07:11 -0700 |
| commit | 322efbb61760887eab5007ff14b00fc0d2aac4a5 (patch) | |
| tree | 34308b5bd52f92f6d9b3cc7670d797ef862b67dc | |
| parent | 09fe2c31fde09f4cde0d435c0f0f2be12372b4e9 (diff) | |
| download | vcpkg-322efbb61760887eab5007ff14b00fc0d2aac4a5.tar.gz vcpkg-322efbb61760887eab5007ff14b00fc0d2aac4a5.zip | |
[ocilib] Update to 4.7.0 (#13158)
| -rw-r--r-- | ports/ocilib/CONTROL | 3 | ||||
| -rw-r--r-- | ports/ocilib/out_of_source_build_version_file_configure.patch | 13 | ||||
| -rw-r--r-- | ports/ocilib/portfile.cmake | 10 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
4 files changed, 7 insertions, 20 deletions
diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL index a4d44f4a3..63f1c0839 100644 --- a/ports/ocilib/CONTROL +++ b/ports/ocilib/CONTROL @@ -1,6 +1,5 @@ Source: ocilib -Version: 4.6.4 -Port-Version: 2 +Version: 4.7.1 Homepage: https://vrogier.github.io/ocilib/ Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases. Supports: !(arm|uwp)
\ No newline at end of file diff --git a/ports/ocilib/out_of_source_build_version_file_configure.patch b/ports/ocilib/out_of_source_build_version_file_configure.patch deleted file mode 100644 index 0359e2323..000000000 --- a/ports/ocilib/out_of_source_build_version_file_configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 6a87f9c..89ca6db 100755 ---- a/configure -+++ b/configure -@@ -12628,7 +12628,7 @@ $as_echo "$OCILIB_PREFIX" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILIB version" >&5 - $as_echo_n "checking for OCILIB version... " >&6; } - -- OCILIB_VER=`cat VERSION` -+ OCILIB_VER=`cat ${srcdir}/VERSION` - - LT_MAJOR=`echo $OCILIB_VER | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - LT_AGE=`echo $OCILIB_VER | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index a8a451f48..3a11d088d 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vrogier/ocilib - REF v4.6.4 - SHA512 83f5614a23c8fb4ab02517dec95d8b490c5ef472302735d5cc4cf483cc51513cc81ae2e1b4618c7c73fb5b071efe422e463b46fa79492ccb4775b511a943295a + REF 8573bce60d4aa4ac421445149003424fc7a69e6d v4.7.1 + SHA512 862c2df2f8e356bfafda32bba2c4564464104afea047b6297241a5ec2da9e1d73f3cd33f55e5bcd0018fb1b3625e756c22baf6821ab51c789359266f989137c8 HEAD_REF master - PATCHES - out_of_source_build_version_file_configure.patch ) if(VCPKG_TARGET_IS_WINDOWS) @@ -46,6 +44,10 @@ if(VCPKG_TARGET_IS_WINDOWS) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug) file(COPY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + endif() else() vcpkg_configure_make( COPY_SOURCE diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0b9eb78c6..e2c7b7730 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1088,7 +1088,6 @@ nvtt:x64-uwp=fail ocilib:arm64-windows=fail ocilib:arm-uwp=fail ocilib:x64-uwp=fail -ocilib:x64-windows-static=fail octomap:arm-uwp=fail octomap:x64-uwp=fail ode:arm64-windows=fail |