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

Build system tweaks from downstream #333

Merged
merged 5 commits into from
Apr 10, 2022
Merged

Build system tweaks from downstream #333

merged 5 commits into from
Apr 10, 2022

Conversation

thesamesam
Copy link
Contributor

Hi,

These are a few patches we've been maintaining downstream in Gentoo which should help general distribution folks out.

The systemd check currently clobbers LDFLAGS from the environment
rather than appending to it.

But we actually want LIBS here anyway, rather than LDFLAGS.

Signed-off-by: Sam James <sam@gentoo.org>
Use LIBS rather than LDFLAGS which ensures automake gets the ordering
right (some LDFLAGS values won't work correctly if not placed exactly before
libraries).

This should functionally work the same as before, just improve compatibility
with bits like -Wl,--as-needed.

Signed-off-by: Sam James <sam@gentoo.org>
Copy link
Collaborator

@gonzoleeman gonzoleeman left a comment

Choose a reason for hiding this comment

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

Except for the unneeded "-f" in "$(RM) -f", looks good. I'd be glad to merge these with that change.

libopeniscsiusr/Makefile Outdated Show resolved Hide resolved
@gonzoleeman
Copy link
Collaborator

@thesamesam ?? Will you resubmit, or should I close this pull request?

@thesamesam
Copy link
Contributor Author

thesamesam commented Apr 5, 2022

Yep, I'll be doing it later today. Yesterday I was busy mostly IRL.

- Don't hardcode GCC, instead respect the detected CC (or from the environment)
- Use $(RM) as the location may vary and we've already done the work to detect it

Signed-off-by: Sam James <sam@gentoo.org>
- On my system, sed appears to be at /bin/sed. So, let's allow overriding
  the location.

- Allow different pkg-config paths too (useful for cross).

Signed-off-by: Sam James <sam@gentoo.org>
Looks like a typo from libnvme. Previously, the installed
.pc file had a blank Version field.

Signed-off-by: Sam James <sam@gentoo.org>
@thesamesam
Copy link
Contributor Author

Done.

@gonzoleeman gonzoleeman merged commit 7de11c9 into open-iscsi:master Apr 10, 2022
@gonzoleeman
Copy link
Collaborator

Thank you!

@thesamesam
Copy link
Contributor Author

Thanks!

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.

None yet

2 participants