Skip to content

Conversation

flavorjones
Copy link
Collaborator

Addresses concerns from #121

Note that:

  • the original pkg-config is in /usr/bin
  • this patch installs the new pkg-config into /usr/local/bin
  • and /usr/local/bin is ahead of /usr/bin in $PATH so the new one should be used by default

If this works, then I'll add some documentation around it.

@flavorjones
Copy link
Collaborator Author

cc @mudge

@mudge
Copy link

mudge commented Jun 3, 2024

Thanks, @flavorjones. What’s the best way for me to test this out?

@flavorjones
Copy link
Collaborator Author

Comparing re2's x86_64-linux build on my laptop between the 1.5.0 image and an image generated from this PR's branch ("1.5.1.dev"):

  • 1.5.0 takes 14m23.800s
  • 1.5.1.dev takes 1m34.937s (!)

@mudge Objections to me merging this and shipping 1.5.1?

@mudge
Copy link

mudge commented Jun 3, 2024

None whatsoever!

@flavorjones
Copy link
Collaborator Author

flavorjones commented Jun 3, 2024

@mudge Here are the steps I took:

  1. on dev machine, clone this branch, run gem build, and run gem install path/to/rake-compiler-dock-1.5.1.dev.gem
  2. in your re2 working directory, update re2.gemspec to depend on 1.5.1.dev
  3. bundle update and bundle package so that your r-c-d builds can access the gem from vendor/cache

That was it.

@flavorjones flavorjones merged commit 6048ed1 into main Jun 3, 2024
@flavorjones flavorjones deleted the 121-update-pkg-config branch June 3, 2024 20:30
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.

2 participants