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

Check for SO_MARK in CMake build #9854

Merged
merged 4 commits into from
Jun 16, 2023
Merged

Conversation

JosiahWI
Copy link
Contributor

This sets the CMake variable TS_HAS_SO_MARK appropriately.

@JosiahWI JosiahWI self-assigned this Jun 15, 2023
@JosiahWI JosiahWI added Build work related to build configuration or environment CMake work related to CMakes scripts or issues labels Jun 15, 2023
@JosiahWI JosiahWI added this to the 10.0.0 milestone Jun 15, 2023
@JosiahWI JosiahWI requested a review from cmcfarlen June 15, 2023 14:34
Copy link
Contributor

@cmcfarlen cmcfarlen left a comment

Choose a reason for hiding this comment

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

This seem unnecessary. Maybe we should just use #if SO_MARK instead of making a new definition for this? afaict this is used in one place in the code.

@JosiahWI
Copy link
Contributor Author

I think it's a good idea to look into which options we don't need anymore, but the autotools build supports this option and it's documented as being available. Maybe we should do that separately?

@JosiahWI
Copy link
Contributor Author

Rebased on master.

cmcfarlen
cmcfarlen previously approved these changes Jun 15, 2023
JosiahWI and others added 3 commits June 15, 2023 17:19
This adds a new CMake option that is ON by default: ENABLE_POSIX_CAP.
If POSIX cap is not found, the configure step will fail and the user
must disable the feature explicitly.
@JosiahWI JosiahWI force-pushed the feat/cmake-so-mark branch 3 times, most recently from 3c7946c to 03821dd Compare June 15, 2023 22:22
@JosiahWI JosiahWI marked this pull request as ready for review June 15, 2023 22:50
@bneradt bneradt merged commit 160f869 into apache:master Jun 16, 2023
@JosiahWI JosiahWI deleted the feat/cmake-so-mark branch June 16, 2023 15:13
cmcfarlen pushed a commit to cmcfarlen/trafficserver that referenced this pull request Jun 3, 2024
* asf/master: (90 commits)
  doc: fix the internal libraries section formatting (apache#9879)
  Add max thread count options to CMake build (apache#9883)
  Add yaml libs reference to HTTP proxy test suite. Closes apache#9882 (apache#9885)
  Add transparent proxy support to CMake build (apache#9884)
  Check for symbol IP_TOS in CMake build (apache#9870)
  RAT license fix: renamed_records.out -> .gold (apache#9876)
  Add traffic_wccp to CMake build (apache#9867)
  cleanup cast warning with reinterpret_cast (apache#9866)
  Fixes Coverity 1513058, introduced with apache#9643 (apache#9860)
  add some missing libs for clang (apache#9865)
  Add support for libunwind in CMake build (apache#9862)
  Add option to build regression tests (apache#9863)
  Fix crash on config reload with BoringSSL (apache#9840)
  Check for SO_PEERCRED in CMake build (apache#9855)
  Check for SO_MARK in CMake build (apache#9854)
  Clean up UnixNetProcessor entanglements. (apache#9825)
  Remove unneeded DEBUG conditionals. (apache#9849)
  Add option to enable fast SDK in CMake build (apache#9853)
  Add support for POSIX Cap in CMake build (apache#9852)
  WCCP: remove ts::Buffer (apache#9824)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build work related to build configuration or environment CMake work related to CMakes scripts or issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants