Skip to content

Commit 2348249

Browse files
committed
(PA-5715) Install xz on AIX and Solaris
This is needed so that we can decompress libxml2 and libxslt release tarballs. On Solaris 10/11, install xz 5.2.8 to match what was done in opencsw[1]. On AIX 7.1, we install 5.2.5, because that's what we have available. On AIX 7.2, we install 5.4.3, since other packages we're installing depend on that version. Also update PATH on AIX and Solaris to refer to the version we installed. [1] https://buildfarm.opencsw.org/source/xref/opencsw/csw/mgar/pkg/xz/trunk/Makefile?r=27065
1 parent 9dffe90 commit 2348249

File tree

9 files changed

+11
-10
lines changed

9 files changed

+11
-10
lines changed

configs/components/libxml2.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
if platform.is_aix?
1212
if platform.name == 'aix-7.1-ppc'
13-
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
13+
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/freeware/bin:$(PATH)"
1414
else
1515
pkg.environment "PATH", "/opt/freeware/bin:$(PATH)"
1616
end
@@ -19,7 +19,7 @@
1919
pkg.environment "CFLAGS", settings[:cflags]
2020
pkg.environment "LDFLAGS", settings[:ldflags]
2121
elsif platform.is_solaris?
22-
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
22+
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin:#{settings[:bindir]}"
2323
pkg.environment "CFLAGS", "#{settings[:cflags]} -std=c99"
2424
pkg.environment "LDFLAGS", settings[:ldflags]
2525
elsif platform.is_macos?

configs/components/libxslt.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
if platform.is_aix?
1414
if platform.name == 'aix-7.1-ppc'
15-
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
15+
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/freeware/bin:$(PATH)"
1616
else
1717
pkg.environment "PATH", "/opt/freeware/bin:$(PATH)"
1818
end
@@ -26,7 +26,7 @@
2626
# don't depend on libgcrypto
2727
disable_crypto = "--without-crypto"
2828
elsif platform.is_solaris?
29-
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
29+
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin:#{settings[:bindir]}"
3030
pkg.environment "CFLAGS", settings[:cflags]
3131
pkg.environment "LDFLAGS", settings[:ldflags]
3232
elsif platform.is_macos?

configs/platforms/aix-7.1-ppc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
cd openssl-1.0.2.1800 && /usr/sbin/installp -acgwXY -d $PWD openssl.base;
4343
curl --output yum.sh https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/aix-yum.sh && sh yum.sh;
4444
/opt/freeware/bin/sed -i 's|https://anonymous:[email protected]/aix/freeSoftware/aixtoolbox/RPMS|https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS|' /opt/freeware/etc/yum/yum.conf;
45-
yum install -y gcc8-c++;
45+
yum install -y gcc8-c++ xz-5.2.5;
4646
ln -sf /opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/8/libgcc_s.a /opt/freeware/lib/libgcc_s.a]
4747

4848
# We use --force with rpm because the pl-gettext and pl-autoconf

configs/platforms/aix-7.2-ppc.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
readline-devel
5050
sed
5151
tar
52+
xz-5.4.3
5253
zlib
5354
zlib-devel
5455
)

configs/platforms/solaris-10-i386.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
/opt/csw/bin/pkgutil -l gcc | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
5151
/opt/csw/bin/pkgutil -l ruby18 | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
5252
/opt/csw/bin/pkgutil -l readline | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
53-
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i rsync gmake pkgconfig ggrep libffi_dev libreadline6 || exit 1;
53+
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i rsync gmake pkgconfig ggrep libffi_dev libreadline6 CSWxz-5.2.8,REV=2022.11.16 || exit 1;
5454
5555
# Install base build dependencies
5656
for pkg in #{base_pkgs.map { |pkg| "SUNW#{pkg}.pkg.gz" }.join(' ')}; do \

configs/platforms/solaris-10-sparc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
/opt/csw/bin/pkgutil -l gcc | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
5252
/opt/csw/bin/pkgutil -l ruby18 | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
5353
/opt/csw/bin/pkgutil -l readline | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
54-
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i rsync gmake libgcc_s1 libreadline6 pkgconfig ggrep ruby20 ruby20_dev gcc4g++ || exit 1;
54+
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i rsync gmake libgcc_s1 libreadline6 pkgconfig ggrep ruby20 ruby20_dev gcc4g++ CSWxz-5.2.8,REV=2022.11.16 || exit 1;
5555
# For some reason, the bison reference is invalid on our artifactory mirror, so get it directly from opencsw.
5656
/opt/csw/bin/pkgutil -y -i bison;
5757
# RE-6121 openssl 1.0.2e requires functionality not in sytem grep

configs/platforms/solaris-11-i386.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
basedir=default" > /var/tmp/vanagon-noask;
4242
echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
4343
pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
44-
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i libffi_dev autoconf gcc4core || exit 1;
44+
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i libffi_dev autoconf gcc4core CSWxz-5.2.8,REV=2022.11.16 || exit 1;
4545
ntpdate pool.ntp.org]
4646
plat.output_dir File.join("solaris", "11", "PC1")
4747
end

configs/platforms/solaris-11-native-sparc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@
5555
basedir=default" > /var/tmp/vanagon-noask;
5656
echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
5757
pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
58-
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i bison || exit 1
58+
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
5959
]
6060
end

configs/platforms/solaris-11-sparc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
basedir=default" > /var/tmp/vanagon-noask;
4242
echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
4343
pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
44-
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i gcc4g++ bison || exit 1
44+
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i gcc4g++ bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
4545
4646
ntpdate pool.ntp.org]
4747
end

0 commit comments

Comments
 (0)