Commit Graph

21 Commits

Author SHA1 Message Date
Billy O'Neal
ae76307e4b
Audit use of TO_NATIVE_PATH. (#26201)
* Audit use of TO_NATIVE_PATH.

TO_NATIVE_PATH should only be used when (1) pasting a path into a command line, or (2) displaying a path to a user. It must not be used before calling other CMake operations like file(WRITE.

Fixes https://github.com/microsoft/vcpkg/issues/26178

ports/ffmpeg/portfile.cmake:
Both uses are being embedded into a command line 

ports/gdal/dependency_win.cmake
117: This used TO_NATIVE_PATH but didn't actually connect the result. It's going on a command line so TO_NATIVE_PATH is appropriate.
Drive by: Added quotes around other uses (all of which seem to be going to command lines).
202: ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL} don't seem to be set even though they are used; I think this is wrong but I don't know for sure that it is so I'm leaving it alone for now.

ports/msmpi/portfile.cmake
All 3 uses are being embedded into a command line 

ports/jemalloc/fix-utilities.patch
ports/libproxy/fix-dependency-libmodman.patch
ports/qtbase/env.patch
These are in upstream content / context so it is not edited.

ports/opengl/portfile.cmake
Broken! Drive by fixes:
* Modernized checking VCPKG_BUILD_TYPE
* Ordered things consistently to be release then debug.
* Removed funny newlines.

ports/openni2/portfile.cmake
Borderline OK; it goes into an MSBuild / vcxproj. I'm leaving it alone. Drive by fixes:
* Guarded debug-only copies for VCPKG_BUILD_TYPE
* Fixed supports expression

ports/openssl/unix/CMakeLists.txt:
Unused!

ports/pthreads/portfile.cmake:
Both uses are being embedded into a command line 

ports/qt5-base/cmake/qt_fix_makefile_install.cmake
I'm not sure if this one is OK but it's being embedded into a file so it's probably fine.

ports/qtapplicationmanager/portfile.cmake:
I'm pretty sure this one is wrong, but it's guarded by VCPKG_TARGET_IS_WINDOWS so the ability to create damage is limited.

ports/readosm/portfile.cmake:
The use is being embedded into a command line 

ports/spatialite-tools/portfile.cmake:
The use is being embedded into a command line 

ports/sqlcipher/portfile.cmake:
Both uses are being embedded into a command line 

scripts/ports.cmake:
Some uses were unused, others are immediately used and printed to the console. 

scripts/buildsystems/vcpkg.cmake:
Fixed :)

scripts/cmake/vcpkg_build_qmake:
Looks unused.

scripts/cmake/vcpkg_build_process.cmake:
Added to console message only. 

scripts/cmake/vcpkg_execute_required_process_repeat.cmake:
Added to console message only. 
Drive by: Fixed typo in variable name in the message.

scripts/cmake/vcpkg_execute_required_process.cmake:
Added to console message only. 

* Fix missing license.
2022-08-12 15:21:20 -07:00
Kai Pastor
498c6e90a1
[openssl] Fix pc files (#26170)
* Fix openssl libdir

* Update versions
2022-08-05 10:30:55 -07:00
Inhzus
6c6d01f07b
[openssl] remove no-stdio for iOS (#26023)
* [openssl] remove no-stdio option for iOS building

* [openssl] 3.0.5#2, remove no-stdio option for iOS building

Co-authored-by: xiling.sz <xiling.sz@alibaba-inc.com>
2022-08-01 14:59:34 -07:00
LilyWangLL
2f0872b7d5
[openssl] Add no-module configure option for static build (#24598)
* [openssl] Add no-module configure option

* update version

* add no-module

* version

* remove change on windows

* x-add-version

* update version

* x-add-version

* fix windows static

* x-add-version

* x-add-version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2022-05-19 00:25:30 -07:00
Thomas1664
be8bb99330
[openssl] Fix dynamic build on OSX (#24090)
* [openssl] Fix dynamic build on OSX

* version

* Use SHLIB_VERSION

* version
2022-04-19 09:38:44 -07:00
Thomas1664
e3e7583380
[openssl] Fix dynamic builds on UNIX (#24061)
* [openssl] Fix dynamic builds on UNIX

* version

* Use version.dat

* version
2022-04-11 08:45:24 -07:00
Kai Pastor
3b3bd42482
[openssl] Don't switch from jom to nmake, fix cflags (#23726)
* Don't switch from jom to nmake

* Use CFLAGS for build type

* Update versions

* Fix flags for clang

* Update versions
2022-03-28 11:45:40 -07:00
Kai Pastor
1baf31a668
[openssl] Fix exported config (#20831)
* Install openssl.pc

* Add pc files for Windows

* Use pkg-config friendly lib names without extension

* Update versions
2021-10-26 22:48:21 -07:00
Heiko Hund
b28d77ada2
[openssl] fix cross compilation with mingw (#17246)
* [openssl] fix cross compilation with mingw

When cross compiling openssl on Linux, e.g.

  ./vcpkg install openssl:x64-mingw-dynamic

failed, because 'windres' was not found. The call to
openssl's Configure was missing the WINDRES environment
variable, which is needed in case it is prefixed. On
Ubuntu the binutils-mingw-w64-x86-64 package installed
it as /usr/bin/x86_64-w64-mingw32-windres.

Since mingw uses openssl-unix to build, it's worth mentioning
that the WINDRES env has no impact for non-mingw and is ignored
there.

* Handle conflicts

* Update version files

* Update ports/openssl/unix/CMakeLists.txt

* Update versions/o-/openssl.json

* Update versions/o-/openssl.json

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-10-15 19:10:32 -07:00
Lucius Q. User
588b1e66f9
[openssl] Fix x86-osx -> arm64-osx cross-compilation (#18630) 2021-07-16 12:51:32 -07:00
Ahmed Yarub Hani Al Nuaimi
c1c253fabc
[aws-sdk-cpp] [openssl] Fix iOS build (#17338)
* Add curl try_compile parameters
Don't set compiler when compiling for iOS

* Update OpenSSL and AWS SDK for C++ port versions

* [vcpkg baseline][marble] Disable find I18n

* update version record

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix port-versions after merging master branch

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix merge conflicts

* Merge master branch

* Refactor OpenSSL's build script

* Refactor OpenSSL's build script

* Fix version

* Fix WASM build

* Fix version

* Fix disabled flags

* Disable treating warnings as errors

* Disable treating warnings as errors

* Fix hashes

* fix indentation

* [aws-sdk-cpp] use the powershell file to generate

* Fix versions after merging

* Fix versions after merging

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-07 12:05:29 -07:00
Eric Hripko
ab3a32e2af
[openssl] Restore Blowfish cipher in OpenSSL (#18148)
* Include Blowfish cipher in OpenSSL

* Bump the version of the port

* x-add-version
2021-06-02 15:36:17 -05:00
Ahmed Yarub Hani Al Nuaimi
f519430b0f
[openssl] [aws-c-common] Fix AWS SDK for C++ build on WASM32 and Android (#17348)
* Add curl try_compile parameters
Don't set compiler when compiling for iOS

* Update OpenSSL and AWS SDK for C++ port versions

* [vcpkg baseline][marble] Disable find I18n

* update version record

* Fix AWS C Common build for WASM32

* Fix OpenSSL build for WASM32

* Update AWS C Common and OpenSSL versions

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix port-versions after merging master branch

* Fix port-versions after merging master branch

* Update versions/o-/openssl.json

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix merge conflicts

* Fix merge conflicts

* Update ports/aws-c-common/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update versions/a-/aws-c-common.json

* Update versions/o-/openssl.json

* Update versions/o-/openssl.json

* Update versions/o-/openssl.json

* Update ports/openssl/CONTROL

* Merge master branch and resolve merge conflicts

* Disable -moutline-atomics in Android also

* Revert line ending change

* Fix version info

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-05-26 14:03:32 -07:00
Kai Pastor
d66dae4134
[Openssl] Fix mingw build (#17456)
* Use 'MINGW' when in CMake project mode

* Bump port-version, format manifest

* x-add-version
2021-05-06 14:00:37 -07:00
Mark Schofield
9cdfdb6041
[openssl/unix] Run make with 'VCPKG_CONCURRENCY' parallelism (#17373) 2021-04-23 13:23:16 -07:00
Ahmed Yarub Hani Al Nuaimi
fe25e8ede8
[aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (#15725)
* Fix Android build

* Add versioning support

* Disable building tests for cURL

* Fix patch file

* Fix patch file

* Fix patch file

* Fix versioning

* Fix patch file

* [aws-sdk-cpp] Update patch

* update baseline

* Fix dependencies

* Simplify Android configuration

* Simplify Android configuration

* Simplify Android configuration
Add alternative Git CMake script

* Bump port version

* Bump version files

* Remove redundant file

* Bump port version

* Fix version files

* Do not build curl, zlib and OpenSSL

* Typo de pkgconfig script

* Fix cURL build for Android

* Add required flags

* Revert macro change

* Fix curl build for other platforms

* Fix curl build for other platforms

* [vcpkg baseline][gsoap] Update to 2.8.111

* Update versions

* [ktx/otl] Update download hash

* update version record

* Fix curl build for other platforms

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Remove FingGit

* Fix configuration step

* Bump cURL port version

* Bump cURL port version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Update ports/curl/CONTROL

* Update ports/curl/portfile.cmake

* update baseline record

* Fix Git

* update version record

* Typo

* Fix cross-platform builds of OpenSSL on MinGW/Windows

* Update version

* Fix version

* update doc

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Add debug libraries to curl for Android
Simplify OpenSSL patch for curl
Update OpenSSL's port version

* Update aws-sdk-cpp, curl, and OpenSSL versions

* Fix libssh after latest update

* Update libssh version

* Update libssh version

* Update ports/libssh/portfile.cmake

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update ports/curl/portfile.cmake

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update ports/libssh/portfile.cmake

* Apply suggestions from code review

* Use correct variables for OpenSSL libraries when building curl for Android
Fix zlib building for Android
Remove redundant patch comments

* Bump zlib's port version

* Update zlib, libssh, and curl versions

* [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path

* update version record

* Update versions/o-/openssl.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-04-19 17:08:51 -07:00
Andrei Lebedev
13293851e3
[openssl] Update to 1.1.1i (#15298)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
2021-01-11 00:08:05 -08:00
Gyusun Yeom
ddeef79a7d
[openssl] install pkgconfig file (#15191)
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-01-08 11:48:55 -08:00
LRFLEW
0a45709941
[openssl] Handle INSTALL_NAME_DIR and OSX_DEPLOYMENT_TARGET for macOS shared builds (#14785)
* [openssl] Handle INSTALL_NAME_DIR for macOS shared builds

* [openssl] Handle OSX_DEPLOYMENT_TARGET for macOS shared builds
2020-12-01 14:30:35 -08:00
Joakim L. Gilje
d9633d939c
[vcpkg] initial openbsd (community) support (#14549)
* initial openbsd support in vcpkg

* after clang-format

* hardcoded in the preferred compiler for openbsd in bootstrap scipt (thanks @tormfinn)

* Fetch a patched pkg-config because openbsd pkg-config lacks {fcfiledir}

* fixes from review feedback

* corrected hash for pkg-config.openbsd

* re-added missing endif()

* regenerate docs

* Update scripts/cmake/vcpkg_configure_meson.cmake

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-23 09:43:23 -08:00
Alexander Neumann
63dccf771d
[OpenSSL] refactor openssl ports. (#14308) 2020-11-03 22:59:02 -08:00