Skip to content

Commit 1940f4f

Browse files
committed
(PA-4719) Use readline on AIX 7.2
But continue using libedit on AIX 7.1
1 parent 58e934d commit 1940f4f

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

Diff for: configs/components/_base-ruby.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@
7070

7171
if platform.is_aix?
7272
pkg.build_requires "runtime-#{settings[:runtime_project]}"
73-
pkg.build_requires "libedit"
73+
if platform.name == 'aix-7.1-ppc'
74+
pkg.build_requires "libedit"
75+
else
76+
pkg.build_requires "readline"
77+
end
7478
elsif platform.is_solaris?
7579
pkg.build_requires "runtime-#{settings[:runtime_project]}"
7680
pkg.build_requires "libedit" if platform.name =~ /^solaris-10-sparc/

Diff for: configs/components/augeas.rb

+6-1
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,14 @@
6363
pkg.environment "PATH", "/opt/freeware/bin:$(PATH):#{settings[:bindir]}"
6464
end
6565
pkg.build_requires "runtime-#{settings[:runtime_project]}"
66+
if platform.name == 'aix-7.1-ppc'
67+
pkg.build_requires 'libedit'
68+
else
69+
pkg.build_requires 'readline'
70+
end
71+
6672
pkg.environment "LDFLAGS", settings[:ldflags]
6773
pkg.environment "CFLAGS", "-I#{settings[:includedir]}"
68-
pkg.build_requires 'libedit'
6974
end
7075

7176
if platform.is_rpm? && !platform.is_aix?

Diff for: configs/components/readline.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
pkg.mirror "#{settings[:buildsources_url]}/#{pkg.get_name}-#{pkg.get_version}.tar.gz"
66

77
if platform.is_aix?
8-
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
8+
raise "readline is not supported on older AIX" if platform.name == 'aix-7.1-ppc'
9+
10+
pkg.environment "PATH", "/opt/freeware/bin:$(PATH)"
911
elsif platform.is_cross_compiled_linux?
1012
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
1113
pkg.environment "CFLAGS", settings[:cflags]

Diff for: configs/projects/_shared-agent-components.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
end
4949

5050
# libedit is used instead of readline on these platforms
51-
if platform.is_solaris? || platform.is_aix?
51+
if platform.is_solaris? || platform.name == 'aix-7.1-ppc'
5252
proj.component 'libedit'
5353
end
5454

Diff for: configs/projects/agent-runtime-main.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
proj.setting :rubygem_hocon_version, '1.4.0'
77

88
# Solaris and AIX depend on libedit which breaks augeas compliation starting with 1.13.0
9-
if platform.is_solaris? || platform.is_aix?
9+
if platform.is_solaris? || platform.name == 'aix-7.1-ppc'
1010
proj.setting :augeas_version, '1.12.0'
1111
else
1212
proj.setting :augeas_version, '1.13.0'

0 commit comments

Comments
 (0)