-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #696 from joshcooper/aix72_libz
(PA-5645) Install additional runtime dependencies
- Loading branch information
Showing
5 changed files
with
50 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,24 +6,35 @@ | |
plat.servicetype "aix" | ||
plat.tar "/opt/freeware/bin/tar" | ||
|
||
plat.provision_with %[ | ||
plat.provision_with %( | ||
curl -O https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/openssl-1.1.2.2000.tar.Z; | ||
uncompress openssl-1.1.2.2000.tar.Z; | ||
tar xvf openssl-1.1.2.2000.tar; | ||
cd openssl-1.1.2.2000 && /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] | ||
curl --output yum.sh https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/aix-yum.sh && sh yum.sh) | ||
|
||
# Since we updated openssl.base, run updtvpkg so that RPM packages that we install | ||
# later build against the new openssl. | ||
# See https://www.ibm.com/support/pages/understanding-aix-virtual-rpm-package-rpmrte | ||
plat.provision_with 'updtvpkg' | ||
|
||
# After installing yum, but before yum installing packages, point yum to artifactory | ||
# AIX sed doesn't support in-place replacement, so download GNU sed and use that | ||
plat.provision_with %[ | ||
plat.provision_with %( | ||
rpm -Uvh https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/sed/sed-4.1.1-1.aix5.1.ppc.rpm; | ||
/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] | ||
/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) | ||
|
||
# yum.sh downloads rpm.rte containing several base packages including curl | ||
# 7.51. However, that version isn't compatible with cmake. If we update curl | ||
# specifically, then yum/python/libcurl will be in an inconsistent state. So | ||
# run `yum update` to update to newer versions while maintaining compatible | ||
# versions. | ||
plat.provision_with 'yum update --assumeyes --skip-broken' | ||
|
||
packages = %w( | ||
autoconf | ||
cmake | ||
coreutils | ||
curl-7.86.0 | ||
gawk | ||
gcc | ||
gcc-c++ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
commit e0e58e7f5ee53e14f7a87a7399ad977a1381861a | ||
Author: Josh Cooper <[email protected]> | ||
Date: Mon Jul 10 22:34:25 2023 -0700 | ||
|
||
Disable terminfo | ||
|
||
If curses libraries can be loaded but terminfo isn't installed, then | ||
reline raises, killing irb. Apply this patch to disable terminfo | ||
integration. | ||
|
||
diff --git a/lib/reline/terminfo.rb b/lib/reline/terminfo.rb | ||
index f53642b919..e0633f802b 100644 | ||
--- a/lib/reline/terminfo.rb | ||
+++ b/lib/reline/terminfo.rb | ||
@@ -163,7 +163,7 @@ def self.tigetnum(capname) | ||
end | ||
|
||
def self.enabled? | ||
- true | ||
+ false | ||
end | ||
end if Reline::Terminfo.curses_dl | ||
|