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

Minor build fixes #4061

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Minor build fixes #4061

merged 2 commits into from
Feb 26, 2024

Conversation

stevendore
Copy link
Contributor

The first commit I noticed there was a missing comma in wflags.py UNDESIRABLE_WFLAGS. The build system didn't seem to care either way but figured it was easy enough to update.

The second commit relates to the auto-generated BUILD_VMOD_$NAME helper generated by VARNISH_VMOD() in configure.ac. When a VMOD adds a CFLAG with libvmod_$1_la_CFLAGS the object name is no longer vmod_$name.lo but $library-vmod_name.lo this changes the build order such that the VCC autogenerated files would not be guaranteed to compile first causing compilation issues. Updating to the $libvmod_$1_la_OBJECTS fixes the build order by letting automake/tools figure out the right object name. It might add in more objects than really desired but it's probably better to have the VCC files always built first.

Issue found in the wild: varnish/libvmod-curl#56

Steven Wojcik added 2 commits February 23, 2024 10:02
When a VMOD adds a CFLAG with `libvmod_$1_la_CFLAGS` the object name is no
longer `vmod_$name.lo` but `$library-vmod_name.lo` this changes the
build order such that the VCC autogenerated files would not be
guaranteed to compile first causing compilation issues.
@nigoroll
Copy link
Member

I cherry-picked the wflags fix, but would like to leave the rest with @dridi .

@nigoroll nigoroll requested a review from dridi February 26, 2024 10:27
Copy link
Member

@dridi dridi left a comment

Choose a reason for hiding this comment

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

Excellent catch!

@nigoroll
Copy link
Member

Merging as per IRC

@nigoroll nigoroll merged commit 1d4950a into varnishcache:master Feb 26, 2024
12 of 14 checks passed
@stevendore stevendore deleted the build_fixes branch February 26, 2024 15:36
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