Skip to content

Dynamically detect libgeos version instead of hardcoding #344

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.

Sign up for GitHub

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

Merged
rail merged 1 commit into from
Dec 9, 2025
Merged

Dynamically detect libgeos version instead of hardcoding #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
common --noenable_bzlmod
Copy link
Contributor

@celiala celiala Dec 9, 2025

Choose a reason for hiding this comment

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

(Required for compatibility with Bazel 6.0+, the repo still uses the legacy WORKSPACE approach)

Copy link
Member Author

@rail rail Dec 9, 2025

Choose a reason for hiding this comment

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

I added it so Basel doesn’t generate mod files

56 changes: 38 additions & 18 deletions Formula/cockroach.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,42 @@ def libgeos_supported?
!(OS.mac? && Hardware::CPU.arm?)
end

# Extract the libgeos library name from libgeos_c dependencies
def detect_libgeos_name(libgeos_c_path)
if OS.mac?
# Use otool to inspect the dylib dependencies
output = `otool -L "#{libgeos_c_path}"`.lines
# Find the line with @rpath/libgeos.*.dylib
geos_line = output.find { |line| line.include?("@rpath/libgeos.") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "@rpath/libgeos.3.13.1.dylib")
geos_line.strip.split[0]
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}"
end
else
# Use patchelf to inspect the shared library dependencies
output = `patchelf --print-needed "#{libgeos_c_path}" 2>&1`
# Find the line with libgeos.so* (but not libgeos_c)
geos_line = output.lines.find { |line| line.strip.start_with?("libgeos.so") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "libgeos.so" or "libgeos.so.3.11.2")
geos_line.strip
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}. Output: #{output}"
end
end
end

def install
bin.install "cockroach"
prefix.install "LICENSE" if File.exist?("LICENSE")
prefix.install "LICENSE.txt" if File.exist?("LICENSE.txt")
prefix.install "THIRD-PARTY-NOTICES.txt"
if OS.mac? && libgeos_supported?
# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("lib/libgeos_c.dylib")

lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.dylib" => "cockroach/libgeos.dylib"
Expand All @@ -45,34 +75,24 @@ def install
"#{lib}/cockroach/libgeos.dylib", "#{lib}/cockroach/libgeos.dylib"
system "install_name_tool", "-id",
"#{lib}/cockroach/libgeos_c.1.dylib", "#{lib}/cockroach/libgeos_c.dylib"
if version < Version.new("23.2.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.8.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
elsif version < Version.new("25.4.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.11.2.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
else
system "install_name_tool", "-change",
"@rpath/libgeos.3.13.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end
system "install_name_tool", "-change",
libgeos_name, "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end

if OS.linux?
lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.so" => "cockroach/libgeos.so"
lib.install "lib/libgeos_c.so" => "cockroach/libgeos_c.so"

# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("#{lib}/cockroach/libgeos_c.so")

system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos.so"
system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos_c.so"
system "patchelf", "--set-soname", "libgeos.so", "#{lib}/cockroach/libgeos.so"
if version < Version.new("23.2.0")
system "patchelf", "--replace-needed", "libgeos.so.3.8.1", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
else
system "patchelf", "--replace-needed", "libgeos.so.3.11.2", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end
system "patchelf", "--replace-needed", libgeos_name, "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end

system bin/"cockroach", "gen", "man", "--path=#{man1}"
Expand Down
56 changes: 38 additions & 18 deletions Formula/cockroach@24.1.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,42 @@ def libgeos_supported?
!(OS.mac? && Hardware::CPU.arm?)
end

# Extract the libgeos library name from libgeos_c dependencies
def detect_libgeos_name(libgeos_c_path)
if OS.mac?
# Use otool to inspect the dylib dependencies
output = `otool -L "#{libgeos_c_path}"`.lines
# Find the line with @rpath/libgeos.*.dylib
geos_line = output.find { |line| line.include?("@rpath/libgeos.") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "@rpath/libgeos.3.13.1.dylib")
geos_line.strip.split[0]
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}"
end
else
# Use patchelf to inspect the shared library dependencies
output = `patchelf --print-needed "#{libgeos_c_path}" 2>&1`
# Find the line with libgeos.so* (but not libgeos_c)
geos_line = output.lines.find { |line| line.strip.start_with?("libgeos.so") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "libgeos.so" or "libgeos.so.3.11.2")
geos_line.strip
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}. Output: #{output}"
end
end
end

def install
bin.install "cockroach"
prefix.install "LICENSE" if File.exist?("LICENSE")
prefix.install "LICENSE.txt" if File.exist?("LICENSE.txt")
prefix.install "THIRD-PARTY-NOTICES.txt"
if OS.mac? && libgeos_supported?
# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("lib/libgeos_c.dylib")

lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.dylib" => "cockroach/libgeos.dylib"
Expand All @@ -45,34 +75,24 @@ def install
"#{lib}/cockroach/libgeos.dylib", "#{lib}/cockroach/libgeos.dylib"
system "install_name_tool", "-id",
"#{lib}/cockroach/libgeos_c.1.dylib", "#{lib}/cockroach/libgeos_c.dylib"
if version < Version.new("23.2.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.8.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
elsif version < Version.new("25.4.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.11.2.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
else
system "install_name_tool", "-change",
"@rpath/libgeos.3.13.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end
system "install_name_tool", "-change",
libgeos_name, "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end

if OS.linux?
lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.so" => "cockroach/libgeos.so"
lib.install "lib/libgeos_c.so" => "cockroach/libgeos_c.so"

# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("#{lib}/cockroach/libgeos_c.so")

system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos.so"
system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos_c.so"
system "patchelf", "--set-soname", "libgeos.so", "#{lib}/cockroach/libgeos.so"
if version < Version.new("23.2.0")
system "patchelf", "--replace-needed", "libgeos.so.3.8.1", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
else
system "patchelf", "--replace-needed", "libgeos.so.3.11.2", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end
system "patchelf", "--replace-needed", libgeos_name, "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end

system bin/"cockroach", "gen", "man", "--path=#{man1}"
Expand Down
56 changes: 38 additions & 18 deletions Formula/cockroach@24.3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,42 @@ def libgeos_supported?
!(OS.mac? && Hardware::CPU.arm?)
end

# Extract the libgeos library name from libgeos_c dependencies
def detect_libgeos_name(libgeos_c_path)
if OS.mac?
# Use otool to inspect the dylib dependencies
output = `otool -L "#{libgeos_c_path}"`.lines
# Find the line with @rpath/libgeos.*.dylib
geos_line = output.find { |line| line.include?("@rpath/libgeos.") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "@rpath/libgeos.3.13.1.dylib")
geos_line.strip.split[0]
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}"
end
else
# Use patchelf to inspect the shared library dependencies
output = `patchelf --print-needed "#{libgeos_c_path}" 2>&1`
# Find the line with libgeos.so* (but not libgeos_c)
geos_line = output.lines.find { |line| line.strip.start_with?("libgeos.so") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "libgeos.so" or "libgeos.so.3.11.2")
geos_line.strip
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}. Output: #{output}"
end
end
end

def install
bin.install "cockroach"
prefix.install "LICENSE" if File.exist?("LICENSE")
prefix.install "LICENSE.txt" if File.exist?("LICENSE.txt")
prefix.install "THIRD-PARTY-NOTICES.txt"
if OS.mac? && libgeos_supported?
# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("lib/libgeos_c.dylib")

lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.dylib" => "cockroach/libgeos.dylib"
Expand All @@ -45,34 +75,24 @@ def install
"#{lib}/cockroach/libgeos.dylib", "#{lib}/cockroach/libgeos.dylib"
system "install_name_tool", "-id",
"#{lib}/cockroach/libgeos_c.1.dylib", "#{lib}/cockroach/libgeos_c.dylib"
if version < Version.new("23.2.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.8.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
elsif version < Version.new("25.4.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.11.2.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
else
system "install_name_tool", "-change",
"@rpath/libgeos.3.13.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end
system "install_name_tool", "-change",
libgeos_name, "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end

if OS.linux?
lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.so" => "cockroach/libgeos.so"
lib.install "lib/libgeos_c.so" => "cockroach/libgeos_c.so"

# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("#{lib}/cockroach/libgeos_c.so")

system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos.so"
system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos_c.so"
system "patchelf", "--set-soname", "libgeos.so", "#{lib}/cockroach/libgeos.so"
if version < Version.new("23.2.0")
system "patchelf", "--replace-needed", "libgeos.so.3.8.1", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
else
system "patchelf", "--replace-needed", "libgeos.so.3.11.2", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end
system "patchelf", "--replace-needed", libgeos_name, "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end

system bin/"cockroach", "gen", "man", "--path=#{man1}"
Expand Down
56 changes: 38 additions & 18 deletions Formula/cockroach@25.1.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,42 @@ def libgeos_supported?
!(OS.mac? && Hardware::CPU.arm?)
end

# Extract the libgeos library name from libgeos_c dependencies
def detect_libgeos_name(libgeos_c_path)
if OS.mac?
# Use otool to inspect the dylib dependencies
output = `otool -L "#{libgeos_c_path}"`.lines
# Find the line with @rpath/libgeos.*.dylib
geos_line = output.find { |line| line.include?("@rpath/libgeos.") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "@rpath/libgeos.3.13.1.dylib")
geos_line.strip.split[0]
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}"
end
else
# Use patchelf to inspect the shared library dependencies
output = `patchelf --print-needed "#{libgeos_c_path}" 2>&1`
# Find the line with libgeos.so* (but not libgeos_c)
geos_line = output.lines.find { |line| line.strip.start_with?("libgeos.so") && !line.include?("libgeos_c") }
if geos_line
# Extract just the library name (e.g., "libgeos.so" or "libgeos.so.3.11.2")
geos_line.strip
else
raise "Could not detect libgeos dependency in #{libgeos_c_path}. Output: #{output}"
end
end
end

def install
bin.install "cockroach"
prefix.install "LICENSE" if File.exist?("LICENSE")
prefix.install "LICENSE.txt" if File.exist?("LICENSE.txt")
prefix.install "THIRD-PARTY-NOTICES.txt"
if OS.mac? && libgeos_supported?
# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("lib/libgeos_c.dylib")

lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.dylib" => "cockroach/libgeos.dylib"
Expand All @@ -45,34 +75,24 @@ def install
"#{lib}/cockroach/libgeos.dylib", "#{lib}/cockroach/libgeos.dylib"
system "install_name_tool", "-id",
"#{lib}/cockroach/libgeos_c.1.dylib", "#{lib}/cockroach/libgeos_c.dylib"
if version < Version.new("23.2.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.8.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
elsif version < Version.new("25.4.0")
system "install_name_tool", "-change",
"@rpath/libgeos.3.11.2.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
else
system "install_name_tool", "-change",
"@rpath/libgeos.3.13.1.dylib", "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end
system "install_name_tool", "-change",
libgeos_name, "#{lib}/cockroach/libgeos.dylib",
"#{lib}/cockroach/libgeos_c.dylib"
end

if OS.linux?
lib.mkpath
mkdir "#{lib}/cockroach"
lib.install "lib/libgeos.so" => "cockroach/libgeos.so"
lib.install "lib/libgeos_c.so" => "cockroach/libgeos_c.so"

# Detect the libgeos version dynamically before modifying the library
libgeos_name = detect_libgeos_name("#{lib}/cockroach/libgeos_c.so")

system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos.so"
system "patchelf", "--set-rpath", "#{lib}/cockroach/", "#{lib}/cockroach/libgeos_c.so"
system "patchelf", "--set-soname", "libgeos.so", "#{lib}/cockroach/libgeos.so"
if version < Version.new("23.2.0")
system "patchelf", "--replace-needed", "libgeos.so.3.8.1", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
else
system "patchelf", "--replace-needed", "libgeos.so.3.11.2", "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end
system "patchelf", "--replace-needed", libgeos_name, "libgeos.so", "#{lib}/cockroach/libgeos_c.so"
end

system bin/"cockroach", "gen", "man", "--path=#{man1}"
Expand Down
Loading
Loading