Skip to content

Commit affb2c3

Browse files
committed
Problem: omnigres packages couldn't build
We now require GCC 12.2 or higher. Solution: use GCC 14 on RHEL
1 parent 1c43783 commit affb2c3

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

packages/omnigres/package.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ def version_git_commit
6767

6868
def configure_steps
6969
extra_config = contains_vendorized_deps? ? "" : "-DCPM_SOURCE_CACHE=$(pwd)/deps/_deps "
70-
["export PIP_CONFIG_FILE=$(pwd)/deps/pip.conf",
71-
"cmake -S #{extension_path} -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo " \
72-
"-DOPENSSL_CONFIGURED=1 -DPG_CONFIG=$PG_CONFIG #{extra_config} -DCMAKE_POSITION_INDEPENDENT_CODE=ON"]
70+
steps = ["export PIP_CONFIG_FILE=$(pwd)/deps/pip.conf",
71+
"cmake -S #{extension_path} -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo " \
72+
"-DOPENSSL_CONFIGURED=1 -DPG_CONFIG=$PG_CONFIG #{extra_config} -DCMAKE_POSITION_INDEPENDENT_CODE=ON"]
73+
steps.unshift("source /opt/rh/gcc-toolset-14/enable") if Pgpm::OS.in_scope.is_a?(Pgpm::OS::RedHat)
74+
steps
7375
end
7476

7577
def build_steps
@@ -106,7 +108,9 @@ def license
106108
end
107109

108110
def build_dependencies
109-
%w[cmake openssl-devel python3 python3-devel nc sudo git] + super
111+
deps = %w[cmake openssl-devel python3 python3-devel nc sudo git] + super
112+
deps.push("gcc-toolset-14") if Pgpm::OS.in_scope.is_a?(Pgpm::OS::RedHat)
113+
deps
110114
end
111115

112116
def dependencies

0 commit comments

Comments
 (0)