vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

net.openssl: use a pkgconfig directive, instead of a hardcoded path (#12735)

pull/12761/head
Jordan Bonecutter 2021-12-07 12:11:47 -08:00 committed by GitHub
parent 7bbc70820a
commit fd4e071621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -260,6 +260,7 @@ jobs:
timeout-minutes: 121 timeout-minutes: 121
env: env:
VFLAGS: -cc clang VFLAGS: -cc clang
PKG_CONFIG_PATH: /usr/local/opt/openssl@3/lib/pkgconfig
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-node@v1 - uses: actions/setup-node@v1
@ -271,6 +272,7 @@ jobs:
brew uninstall --ignore-dependencies libpq ## libpq is a dependency of PHP brew uninstall --ignore-dependencies libpq ## libpq is a dependency of PHP
brew install postgresql openssl brew install postgresql openssl
export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/" export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/"
echo "PKG_CONFIG_PATH is '$PKG_CONFIG_PATH'"
- name: Build V - name: Build V
run: make -j4 && ./v -cg -cstrict -o v cmd/v run: make -j4 && ./v -cg -cstrict -o v cmd/v
- name: Run sanitizers - name: Run sanitizers

3
vlib/net/openssl/c.v
View File

@ -5,7 +5,8 @@ module openssl
// openssl from libssl-dev. If there is no local openssl, // openssl from libssl-dev. If there is no local openssl,
// the next flag is harmless, since it will still use the // the next flag is harmless, since it will still use the
// (older) system openssl. // (older) system openssl.
#flag linux -I/usr/local/include/openssl -L/usr/local/lib #pkgconfig openssl
#flag linux -L/usr/local/lib
#flag windows -l libssl -l libcrypto #flag windows -l libssl -l libcrypto
#flag -lssl -lcrypto #flag -lssl -lcrypto
#flag linux -ldl -lpthread #flag linux -ldl -lpthread