Skip to content

Commit cf73c38

Browse files
author
Sean P. McDonald
committed
Revert "(PA-2055) Add vendored yaml-cpp and boost"
This reverts commit fd8c9e4.
1 parent e0a8680 commit cf73c38

20 files changed

+19
-638
lines changed

‎configs/components/_base-ruby-augeas.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
pkg.environment "PATH", "$(PATH):/opt/pl-build-tools/bin:/usr/local/bin:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin"
2121
if platform.is_aix?
22-
# We still use pl-gcc for AIX 7.1
22+
pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/pkg-config-0.19-6.aix5.2.ppc.rpm"
2323
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
2424
pkg.environment "RUBY", host_ruby
2525
pkg.environment "LDFLAGS", " -brtl #{settings[:ldflags]}"

‎configs/components/_base-ruby.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
#############
3535

3636
if platform.is_aix?
37-
# We still use pl-gcc for AIX 7.1
38-
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
37+
pkg.environment 'CC', '/opt/pl-build-tools/bin/gcc'
3938
pkg.environment 'LDFLAGS', "#{settings[:ldflags]} -Wl,-bmaxdata:0x80000000"
4039
elsif platform.is_solaris?
4140
pkg.environment 'PATH', "#{settings[:bindir]}:/usr/ccs/bin:/usr/sfw/bin:$$PATH:/opt/csw/bin"
@@ -86,7 +85,8 @@
8685
end
8786

8887
if platform.is_aix?
89-
# Do nothing here, all package requirements in the platform file
88+
pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/zlib-1.2.3-4.aix5.2.ppc.rpm"
89+
pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/zlib-devel-1.2.3-4.aix5.2.ppc.rpm"
9090
elsif platform.is_deb?
9191
pkg.build_requires 'zlib1g-dev'
9292
elsif platform.is_rpm?

‎configs/components/augeas.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
pkg.environment "PKG_CONFIG_PATH", "#{settings[:libdir]}/pkgconfig"
4242

4343
if platform.is_aix?
44-
# We still use pl-gcc for AIX 7.1
44+
pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/pkg-config-0.19-6.aix5.2.ppc.rpm"
4545
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
46-
pkg.build_requires "runtime-#{settings[:runtime_project]}"
4746
pkg.environment "LDFLAGS", settings[:ldflags]
4847
pkg.environment "CFLAGS", "-I#{settings[:includedir]}"
4948
pkg.build_requires 'libedit'
49+
pkg.build_requires "runtime-#{settings[:runtime_project]}"
5050
end
5151

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

‎configs/components/boost.rb

-165
This file was deleted.

‎configs/components/libedit.rb

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
if platform.is_solaris?
1010
pkg.environment "CC", "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc"
1111
elsif platform.is_aix?
12+
pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/gawk-3.1.3-1.aix5.1.ppc.rpm"
1213
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
1314
pkg.environment "LDFLAGS", settings[:ldflags]
1415
end

‎configs/components/openssl.rb

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
'linux64-s390x'
3737
end
3838
elsif platform.is_aix?
39-
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
39+
pkg.environment 'CC', '/opt/pl-build-tools/bin/gcc'
40+
4041
cflags = '$${CFLAGS} -static-libgcc'
4142
target = 'aix-gcc'
4243
elsif platform.is_solaris?
@@ -75,7 +76,7 @@
7576
pkg.build_requires 'xorg-x11-util-devel' if platform.name =~ /^sles/
7677
pkg.build_requires 'xutils-dev' if platform.is_deb?
7778
elsif platform.is_aix?
78-
# Do nothing, aix requirements are included in platform file
79+
pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/aix/#{platform.os_version}/ppc/pl-gcc-5.2.0-11.aix#{platform.os_version}.ppc.rpm"
7980
elsif platform.is_macos?
8081
pkg.build_requires 'makedepend'
8182
elsif platform.is_cross_compiled_linux?

‎configs/components/ruby-2.4.4.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888
####################
8989

9090
if platform.is_aix?
91+
pkg.build_requires 'http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/zlib-1.2.3-4.aix5.2.ppc.rpm'
92+
9193
# TODO: Remove this once PA-1607 is resolved.
9294
pkg.build_requires 'http://pl-build-tools.delivery.puppetlabs.net/aix/5.3/ppc/pl-autoconf-2.69-1.aix5.3.ppc.rpm'
9395
end
@@ -167,7 +169,6 @@
167169
###########
168170

169171
# TODO: Remove this once PA-1607 is resolved.
170-
# TODO: Can we use native autoconf? The dependencies seemed a little too extensive
171172
pkg.configure { ["/opt/pl-build-tools/bin/autoconf"] } if platform.is_aix?
172173

173174
# Here we set --enable-bundled-libyaml to ensure that the libyaml included in

‎configs/components/runtime-agent.rb

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
pkg.build_requires "pl-binutils-#{platform.architecture}"
1616
pkg.build_requires "pl-gcc-#{platform.architecture}"
1717
elsif platform.is_aix?
18+
pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/aix/#{platform.os_version}/ppc/pl-gcc-5.2.0-11.aix#{platform.os_version}.ppc.rpm"
1819
libdir = "/opt/pl-build-tools/lib/gcc/powerpc-ibm-aix#{platform.os_version}.0.0/5.2.0/"
1920
elsif platform.is_windows?
2021
# We only need zlib because curl is dynamically linking against zlib

‎configs/components/yaml-cpp.rb

-96
This file was deleted.

‎configs/platforms/aix-6.1-ppc.rb

+2-23
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,8 @@
66
plat.rpmbuild "/usr/bin/rpm"
77
plat.patch "/opt/freeware/bin/patch"
88

9-
os_version = 6.1
10-
# We can't rely on yum, and rpm can't download over https on AIX, so curl packages before installing them
11-
# Order matters here - there is no automatic dependency resolution
12-
packages = [
13-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_oss4aix.org/RPMS/mktemp/mktemp-1.7-1.aix5.1.ppc.rpm",
14-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/rsync/rsync-3.0.6-1.aix5.3.ppc.rpm",
15-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/coreutils/coreutils-5.2.1-2.aix5.1.ppc.rpm",
16-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/sed/sed-4.1.1-1.aix5.1.ppc.rpm",
17-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/make/make-3.80-1.aix5.1.ppc.rpm",
18-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/tar/tar-1.22-1.aix6.1.ppc.rpm",
19-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/pkg-config/pkg-config-0.19-6.aix5.2.ppc.rpm",
20-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/zlib/zlib-1.2.3-4.aix5.2.ppc.rpm",
21-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/zlib/zlib-devel-1.2.3-4.aix5.2.ppc.rpm",
22-
"https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/gawk/gawk-3.1.3-1.aix5.1.ppc.rpm",
23-
"http://pl-build-tools.delivery.puppetlabs.net/aix/#{os_version}/ppc/pl-gcc-5.2.0-11.aix#{os_version}.ppc.rpm",
24-
"http://pl-build-tools.delivery.puppetlabs.net/aix/#{os_version}/ppc/pl-cmake-3.2.3-2.aix#{os_version}.ppc.rpm",
25-
]
26-
27-
packages.each do |uri|
28-
name = uri.split("/").last
29-
plat.provision_with("curl -O #{uri} > /dev/null")
30-
plat.provision_with("rpm -Uvh --replacepkgs --nodeps #{name}")
31-
end
9+
# Basic vanagon operations require mktemp, rsync, coreutils, make, tar and sed so leave this in there
10+
plat.provision_with "rpm -Uvh --replacepkgs http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/mktemp-1.7-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/rsync-3.0.6-1.aix5.3.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/coreutils-5.2.1-2.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/sed-4.1.1-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/make-3.80-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/tar-1.22-1.aix6.1.ppc.rpm"
3211

3312
# We use --force with rpm because the pl-gettext and pl-autoconf
3413
# packages conflict with a charset.alias file.

0 commit comments

Comments
 (0)