Skip to content

Commit

Permalink
(maint) Remove dead ppc64 code
Browse files Browse the repository at this point in the history
It was possible to build el-7-ppc64 at one point, see
puppetlabs/puppet-agent@bc31f0733d, but that platform was deleted in
puppetlabs/puppet-agent@a1a06ba3f4 and puppetlabs/ci-job-configs@1d81f64.

Note ppc64 is a different platform than ppc64le. We still support el-8-ppc64le.
  • Loading branch information
joshcooper committed Aug 1, 2023
1 parent 5b0d814 commit 6ee0a51
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 109 deletions.
35 changes: 0 additions & 35 deletions configs/components/_base-ruby-augeas.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,31 +57,6 @@
ruby = File.join(ruby_bindir, 'ruby')
end

# This is a disturbing workaround needed for s390x based systems, that
# for some reason isn't encountered with our other architecture cross
# builds. When trying to build the augeas test cases for extconf.rb,
# the process fails with "/opt/pl-build-tools/bin/s390x-linux-gnu-gcc:
# error while loading shared libraries: /opt/puppetlabs/puppet/lib/libstdc++.so.6:
# ELF file data encoding not little-endian". It will also complain in
# the same way about libgcc. If however we temporarily move these
# libraries out of the way, extconf.rb and the cross-compile work
# properly. This needs to be fixed, but I've spent over a week analyzing
# every possible angle that could cause this, from rbconfig settings to
# strace logs, and we need to move forward on this platform.
#
# This seems to apply directly to Linux on ppc64 - I've gotten successful builds
# with this change.
# FIXME: Scott Garman Jun 2016
if platform.architecture == "ppc64"
pkg.configure do
[
"mkdir #{settings[:libdir]}/hide",
"mv #{settings[:libdir]}/libstdc* #{settings[:libdir]}/hide/",
"mv #{settings[:libdir]}/libgcc* #{settings[:libdir]}/hide/"
]
end
end

pkg.build do
build_commands = []
if ruby_version =~ /^3/
Expand Down Expand Up @@ -115,16 +90,6 @@
end
end

# Undo the gross hack from the configure step
if platform.architecture == "ppc64"
pkg.install do
[
"mv #{settings[:libdir]}/hide/* #{settings[:libdir]}/",
"rmdir #{settings[:libdir]}/hide/"
]
end
end

# Clean after install in case we are building for multiple rubies.
pkg.install do
"#{platform[:make]} -e clean"
Expand Down
33 changes: 0 additions & 33 deletions configs/components/ruby-shadow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,6 @@
ruby = File.join(settings[:ruby_bindir], 'ruby')
end

# This is a disturbing workaround needed for s390x based systems, that
# for some reason isn't encountered with our other architecture cross
# builds. When trying to build the libshadow test cases for extconf.rb,
# the process fails with "/opt/pl-build-tools/bin/s390x-linux-gnu-gcc:
# error while loading shared libraries: /opt/puppetlabs/puppet/lib/libstdc++.so.6:
# ELF file data encoding not little-endian". It will also complain in
# the same way about libgcc. If however we temporarily move these
# libraries out of the way, extconf.rb and the cross-compile work
# properly. This needs to be fixed, but I've spent over a week analyzing
# every possible angle that could cause this, from rbconfig settings to
# strace logs, and we need to move forward on this platform.
# FIXME: Scott Garman Jun 2016
# Added to ppc64
if platform.architecture == "ppc64"
pkg.configure do
[
"mkdir #{settings[:libdir]}/hide",
"mv #{settings[:libdir]}/libstdc* #{settings[:libdir]}/hide/",
"mv #{settings[:libdir]}/libgcc* #{settings[:libdir]}/hide/"
]
end
end

matchdata = platform.settings[:ruby_version].match /(\d+)\.(\d+)\.\d+/
ruby_major_version = matchdata[1].to_i
if ruby_major_version >= 3
Expand All @@ -59,14 +36,4 @@
pkg.install do
["#{platform[:make]} -e -j$(shell expr $(shell #{platform[:num_cores]}) + 1) DESTDIR=/ install"]
end

# Undo the gross hack from the configure step
if platform.architecture == "ppc64"
pkg.install do
[
"mv #{settings[:libdir]}/hide/* #{settings[:libdir]}/",
"rmdir #{settings[:libdir]}/hide/"
]
end
end
end
40 changes: 0 additions & 40 deletions configs/platforms/el-7-ppc64.rb

This file was deleted.

1 change: 0 additions & 1 deletion configs/projects/_shared-agent-settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
proj.setting(:ruby_vendordir, File.join(proj.libdir, "ruby", "vendor_ruby"))

# Cross-compiled Linux platforms
platform_triple = "ppc64-redhat-linux" if platform.architecture == "ppc64"
platform_triple = "ppc64le-redhat-linux" if platform.architecture == "ppc64le"
platform_triple = "powerpc64le-suse-linux" if platform.architecture == "ppc64le" && platform.name =~ /^sles-/
platform_triple = "powerpc64le-linux-gnu" if platform.architecture == "ppc64el"
Expand Down

0 comments on commit 6ee0a51

Please sign in to comment.