Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for curl build #6594

Merged
merged 5 commits into from
Jul 12, 2023
Merged

Fix for curl build #6594

merged 5 commits into from
Jul 12, 2023

Conversation

lealem47
Copy link
Contributor

Description

Fix for curl build error & other small fixups

Testing

Building locally

Checklist

  • added tests
  • updated/added doxygen
  • updated appropriate READMEs
  • Updated manual and documentation

@@ -31,9 +31,6 @@ decouple library dependencies with standard string, memory and so on.
#ifndef WOLF_CRYPT_TYPES_H
#define WOLF_CRYPT_TYPES_H

#ifdef HAVE_CONFIG_H
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double check that all .c files in the library proper have this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked like they all did. I did however find more references to config.h that I removed/replaced with the appropriate header

@lealem47 lealem47 requested a review from dgarske July 11, 2023 16:28
@lealem47
Copy link
Contributor Author

@julek-wolfssl @gojimmypi This builds fine with 3rd party apps, but I still can't tell if we intend to pull in HAVE_PTHREAD from config.h or from the define in wolfssl/wolfcrypt/wc_port.h. Or both?

@julek-wolfssl
Copy link
Member

Could you add a github action for curl testing? Can also be in a separate pr to push this out quicker.

@lealem47
Copy link
Contributor Author

Retest this please

@dgarske dgarske merged commit b8119af into wolfSSL:master Jul 12, 2023
70 checks passed
run: ./configure --with-wolfssl
- name: curl make
working-directory: ./curl
run: make
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a good idea to call make -j to get it building faster.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah good suggestion. I'll add it when I'm doing another PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants