Skip to content
This repository has been archived by the owner on Jan 15, 2025. It is now read-only.

Commit

Permalink
(PA-5715) Install xz on AIX and Solaris
Browse files Browse the repository at this point in the history
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
  • Loading branch information
joshcooper committed Apr 17, 2024
1 parent b33b3ae commit d87c736
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions configs/components/libxml2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

if platform.is_aix?
if platform.name == 'aix-7.1-ppc'
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/freeware/bin:$(PATH)"
else
pkg.environment "PATH", "/opt/freeware/bin:$(PATH)"
end
Expand All @@ -19,7 +19,7 @@
pkg.environment "CFLAGS", settings[:cflags]
pkg.environment "LDFLAGS", settings[:ldflags]
elsif platform.is_solaris?
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin:#{settings[:bindir]}"
pkg.environment "CFLAGS", "#{settings[:cflags]} -std=c99"
pkg.environment "LDFLAGS", settings[:ldflags]
elsif platform.is_macos?
Expand Down
4 changes: 2 additions & 2 deletions configs/components/libxslt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

if platform.is_aix?
if platform.name == 'aix-7.1-ppc'
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/freeware/bin:$(PATH)"
else
pkg.environment "PATH", "/opt/freeware/bin:$(PATH)"
end
Expand All @@ -26,7 +26,7 @@
# don't depend on libgcrypto
disable_crypto = "--without-crypto"
elsif platform.is_solaris?
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin:#{settings[:bindir]}"
pkg.environment "CFLAGS", settings[:cflags]
pkg.environment "LDFLAGS", settings[:ldflags]
elsif platform.is_macos?
Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/aix-7.1-ppc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
cd openssl-1.0.2.1800 && /usr/sbin/installp -acgwXY -d $PWD openssl.base;
curl --output yum.sh https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/aix-yum.sh && sh yum.sh;
/opt/freeware/bin/sed -i 's|https://anonymous:anonymous@public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/RPMS|https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS|' /opt/freeware/etc/yum/yum.conf;
yum install -y gcc8-c++;
yum install -y gcc8-c++ xz-5.2.5;
ln -sf /opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/8/libgcc_s.a /opt/freeware/lib/libgcc_s.a]

# We use --force with rpm because the pl-gettext and pl-autoconf
Expand Down
1 change: 1 addition & 0 deletions configs/platforms/aix-7.2-ppc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
readline-devel
sed
tar
xz-5.4.3
zlib
zlib-devel
)
Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/solaris-10-i386.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
/opt/csw/bin/pkgutil -l gcc | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
/opt/csw/bin/pkgutil -l ruby18 | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
/opt/csw/bin/pkgutil -l readline | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i rsync gmake pkgconfig ggrep libffi_dev libreadline6 || exit 1;
/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;
# Install base build dependencies
for pkg in #{base_pkgs.map { |pkg| "SUNW#{pkg}.pkg.gz" }.join(' ')}; do \
Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/solaris-10-sparc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
/opt/csw/bin/pkgutil -l gcc | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
/opt/csw/bin/pkgutil -l ruby18 | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
/opt/csw/bin/pkgutil -l readline | xargs -I{} pkgrm -n -a /var/tmp/vanagon-noask {};
/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;
/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;
# For some reason, the bison reference is invalid on our artifactory mirror, so get it directly from opencsw.
/opt/csw/bin/pkgutil -y -i bison;
# RE-6121 openssl 1.0.2e requires functionality not in sytem grep
Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/solaris-11-i386.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
basedir=default" > /var/tmp/vanagon-noask;
echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i libffi_dev autoconf gcc4core || exit 1;
/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;
ntpdate pool.ntp.org]
plat.output_dir File.join("solaris", "11", "PC1")
end
2 changes: 1 addition & 1 deletion configs/platforms/solaris-11-native-sparc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
basedir=default" > /var/tmp/vanagon-noask;
echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i bison || exit 1
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
]
end
2 changes: 1 addition & 1 deletion configs/platforms/solaris-11-sparc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
basedir=default" > /var/tmp/vanagon-noask;
echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i gcc4g++ bison || exit 1
/opt/csw/bin/pkgutil -U && /opt/csw/bin/pkgutil -y -i gcc4g++ bison CSWxz-5.2.8,REV=2022.11.16 || exit 1
ntpdate pool.ntp.org]
end

0 comments on commit d87c736

Please sign in to comment.