Skip to content

curl-wolfssl.m4: fix to use the correct value for pkg-config directory#20943

Closed
vszakats wants to merge 1 commit intocurl:masterfrom
vszakats:am-wolfssl-bogus-pkgconf-path
Closed

curl-wolfssl.m4: fix to use the correct value for pkg-config directory#20943
vszakats wants to merge 1 commit intocurl:masterfrom
vszakats:am-wolfssl-bogus-pkgconf-path

Conversation

@vszakats
Copy link
Copy Markdown
Member

@vszakats vszakats commented Mar 16, 2026

Before this patch the $withval variable may have contained yes or
other unrelated values, instead of the wolfSSL directory configured via
--with-wolfssl=.

Fixing:

checking for wolfssl options with pkg-config... found
configure: pkg-config --exists wolfssl trace:
---- begin
PKG_CONFIG_PATH: |/home/runner/wolfssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig|
PKG_CONFIG_LIBDIR: |yes/lib/pkgconfig|         <=============== 'yes' used as base directory
trying path: /home/runner/wolfssl/build/lib/pkgconfig for wolfssl
---- end

Ref: https://github.com/curl/curl/actions/runs/23146424326/job/67235762794?pr=20920#step:18:245

Cherry-picked from #20920

Before this patch the `$withval` variable may have contained `yes` (or
other unrelated values) instead of the wolfSSL directory configured with
`--with-wolfssl=`.

Fixing:
```
checking for wolfssl options with pkg-config... found
configure: pkg-config --exists wolfssl trace:
---- begin
PKG_CONFIG_PATH: |/home/runner/wolfssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig|
PKG_CONFIG_LIBDIR: |yes/lib/pkgconfig|         <=============== 'yes' used as base directory
trying path: /home/runner/wolfssl/build/lib/pkgconfig for wolfssl
---- end
```
Ref: https://github.com/curl/curl/actions/runs/23146424326/job/67235762794?pr=20920#step:18:245

Cherry-picked from curl#20920
vszakats added a commit to vszakats/curl that referenced this pull request Mar 16, 2026
Tidy up, for robustness and consistency.

Ref: curl#20943
Cherry-picked from curl#20920
@vszakats vszakats closed this in 3ba48ee Mar 16, 2026
vszakats added a commit that referenced this pull request Mar 16, 2026
Tidy up, for robustness and consistency.

Ref: #20943
Cherry-picked from #20920

Closes #20944
@vszakats vszakats deleted the am-wolfssl-bogus-pkgconf-path branch March 16, 2026 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant