Skip to content

Conversation

@SolidWallOfCode
Copy link
Member

@SolidWallOfCode SolidWallOfCode commented Feb 10, 2023

This fixes some issues with libswoc from the merge of 10-Dev to master.

  • There were some absolute paths for libswoc headers which caused conflicts with external libswoc use.
  • Some @SWOC_INCLUDES@ were missing (this caused the "string_view_util.h" issue).
  • Tweaked up the libswoc checks to handle -ltsswoc vs. -lswoc.
  • Added support for pulling data from the pkg config file in libswoc.
  • Removed "split values" where the lib and include could be done separately by using a colon separator. This is just extraneous junk since libswoc provides a pkg config file (see previous item).
  • Replaced file checks with compile check.
  • libswoc headers are not exported for external libswoc.

For external libswoc use, this now assumes there is a "libswoc.so" to link. This should be done with a symlink in the standard way. The internal built libswoc is named "libtsswoc.so" to help avoid collisions.

@SolidWallOfCode SolidWallOfCode added Build work related to build configuration or environment CPP API labels Feb 10, 2023
@SolidWallOfCode SolidWallOfCode added this to the 10.0.0 milestone Feb 10, 2023
@SolidWallOfCode SolidWallOfCode self-assigned this Feb 10, 2023
zwoop
zwoop previously approved these changes Feb 13, 2023
@SolidWallOfCode SolidWallOfCode changed the title Remove absolute libswoc include paths. Build: improve libswoc building. Feb 13, 2023
@bryancall bryancall requested a review from zwoop February 13, 2023 23:13
Copy link
Contributor

@zwoop zwoop left a comment

Choose a reason for hiding this comment

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

Yeh this works for me.

Copy link
Contributor

@dragon512 dragon512 left a comment

Choose a reason for hiding this comment

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

With the pr SolidWallOfCode/libswoc#78 this works for me with libswoc 1.4.2. I have ats 10 rpm here to be tested. Thanks @SolidWallOfCode !

@SolidWallOfCode SolidWallOfCode merged commit a3b1a7d into apache:master Feb 15, 2023
cmcfarlen pushed a commit to cmcfarlen/trafficserver that referenced this pull request Jun 3, 2024
* asf/master: (49 commits)
  Cleanup: removing some traffic_manager leftovers. (apache#9425)
  records.yaml - Add support to load multiple YAML docs from the same file and let traffic_ctl to modify a records.yaml file (apache#9404)
  QUIC-quiche: Use configured disable_active_migration param at quiche transport configuration. (apache#9447)
  records.yaml: Make sure we fail if we found a legacy records.config file. (apache#9435)
  Use TSDbg in webp_transform plugin (apache#9439)
  quic: make sure we create a stream if none available. (apache#9436)
  Fixes comparison with the wrong type (apache#9441)
  On arm64 macOS, do not use pagezero linker flag when using luajit (apache#9430)
  tscore: Remove unneeded and mispelled libswoc reference. (apache#9429)
  Remove UDP_stubs.h (apache#9413)
  Make jsonrcp restricted_api false by default. (apache#9415)
  Histogram: rename members because Zwoop. (apache#9417)
  FileManager string update (apache#9416)
  P_SSLUtils.h include updates (apache#9414)
  libswoc: update build support to fix issues with 10-Dev merge. (apache#9397)
  QUIC: Remove hardcoded quiche set_initial_max_streams and use config values instead. (apache#9412)
  Fixes the compile to work with LLVM15 (apache#9410)
  update cmake for rpc and swoc (apache#9409)
  Removes the UglyStub file (apache#9401)
  TSan: Make Thread::cur_time thread local (apache#9184)
  ...
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 CPP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants