diff options
| author | victorburckel <victor.burckel@gmail.com> | 2020-05-27 06:38:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 21:38:37 -0700 |
| commit | dbd822571e0ee68e0605ce03e386052e55db8229 (patch) | |
| tree | 23059c7519811376fb99243d9e211691632d0b67 | |
| parent | 46d0f05e2dc8c2df63dfb6e81294d88cf99c391a (diff) | |
| download | vcpkg-dbd822571e0ee68e0605ce03e386052e55db8229.tar.gz vcpkg-dbd822571e0ee68e0605ce03e386052e55db8229.zip | |
[ocilib] Add new port (#11549)
* ocilib port
* Update ci.baseline
* Code review
* Code review
| -rw-r--r-- | ports/ocilib/CONTROL | 5 | ||||
| -rw-r--r-- | ports/ocilib/out_of_source_build_version_file_configure.patch | 13 | ||||
| -rw-r--r-- | ports/ocilib/portfile.cmake | 50 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 4 |
4 files changed, 72 insertions, 0 deletions
diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL new file mode 100644 index 000000000..722223b00 --- /dev/null +++ b/ports/ocilib/CONTROL @@ -0,0 +1,5 @@ +Source: ocilib +Version: 4.6.4 +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 new file mode 100644 index 000000000..0359e2323 --- /dev/null +++ b/ports/ocilib/out_of_source_build_version_file_configure.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..17e1e0358 --- /dev/null +++ b/ports/ocilib/portfile.cmake @@ -0,0 +1,50 @@ +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 + HEAD_REF master + PATCHES + out_of_source_build_version_file_configure.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(SOLUTION_TYPE vs2019) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(SOLUTION_TYPE vs2017) + else() + set(SOLUTION_TYPE vs2015) + endif() + + # There is no debug configuration + # As it is a C library, build the release configuration and copy its output to the debug folder + set(VCPKG_BUILD_TYPE release) + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH proj/dll/ocilib_dll_${SOLUTION_TYPE}.sln + INCLUDES_SUBPATH include + LICENSE_SUBPATH LICENSE + RELEASE_CONFIGURATION "Release - ANSI" + PLATFORM ${VCPKG_TARGET_ARCHITECTURE} + USE_VCPKG_INTEGRATION + ALLOW_ROOT_INCLUDES) + + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug) + file(COPY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) +else() + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --with-oracle-import=runtime + ) + + vcpkg_install_make() + + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/${PORT} ${CURRENT_PACKAGES_DIR}/share/${PORT}) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5eac96a3e..b606084f1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1248,6 +1248,10 @@ numactl:x86-windows=fail nvtt:arm64-windows=fail
nvtt:arm-uwp=fail
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
|
