Revert "Revert "(PA-2055) Add vendored yaml-cpp and boost""

This reverts commit cf73c38.

Author: Sean P. McDonald

Diff for: configs/components/_base-ruby-augeas.rb

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

Diff for: configs/components/_base-ruby.rb

@@ -34,7 +34,8 @@
 #############
 
 if platform.is_aix?
-  pkg.environment 'CC', '/opt/pl-build-tools/bin/gcc'
+  # We still use pl-gcc for AIX 7.1
+  pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
   pkg.environment 'LDFLAGS', "#{settings[:ldflags]} -Wl,-bmaxdata:0x80000000"
 elsif platform.is_solaris?
   pkg.environment 'PATH', "#{settings[:bindir]}:/usr/ccs/bin:/usr/sfw/bin:$$PATH:/opt/csw/bin"
@@ -85,8 +86,7 @@
 end
 
 if platform.is_aix?
-  pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/zlib-1.2.3-4.aix5.2.ppc.rpm"
-  pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/zlib-devel-1.2.3-4.aix5.2.ppc.rpm"
+  # Do nothing here, all package requirements in the platform file
 elsif platform.is_deb?
   pkg.build_requires 'zlib1g-dev'
 elsif platform.is_rpm?

Diff for: configs/components/augeas.rb

@@ -41,12 +41,12 @@
   pkg.environment "PKG_CONFIG_PATH", "#{settings[:libdir]}/pkgconfig"
 
   if platform.is_aix?
-    pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/pkg-config-0.19-6.aix5.2.ppc.rpm"
+        # We still use pl-gcc for AIX 7.1
     pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
+    pkg.build_requires "runtime-#{settings[:runtime_project]}"
     pkg.environment "LDFLAGS", settings[:ldflags]
     pkg.environment "CFLAGS", "-I#{settings[:includedir]}"
     pkg.build_requires 'libedit'
-    pkg.build_requires "runtime-#{settings[:runtime_project]}"
   end
 
   if platform.is_rpm? && !platform.is_aix?

Diff for: configs/components/boost.rb

@@ -0,0 +1,165 @@
+component "boost" do |pkg, settings, platform|
+  # Source-Related Metadata
+  pkg.version "1.67.0"
+  pkg.md5sum "4850fceb3f2222ee011d4f3ea304d2cb"
+  # Apparently boost doesn't use dots to version they use underscores....arg
+  pkg.url "http://downloads.sourceforge.net/project/boost/boost/#{pkg.get_version}/boost_#{pkg.get_version.gsub('.','_')}.tar.gz"
+  pkg.mirror "#{settings[:buildsources_url]}/boost_#{pkg.get_version.gsub('.','_')}.tar.gz"
+
+  if platform.is_solaris?
+    pkg.apply_patch 'resources/patches/boost/0001-fix-build-for-solaris.patch'
+    pkg.apply_patch 'resources/patches/boost/Fix-bootstrap-build-for-solaris-10.patch'
+  end
+
+  if platform.is_solaris? || platform.is_aix?
+    pkg.apply_patch 'resources/patches/boost/solaris-aix-boost-filesystem-unique-path.patch'
+  end
+
+  if platform.is_cisco_wrlinux?
+    pkg.apply_patch 'resources/patches/boost/no-fionbio.patch'
+  end
+
+  if platform.architecture == "aarch64"
+    #pkg.apply_patch 'resources/patches/boost/boost-aarch64-flags.patch'
+  end
+
+  # Package Dependency Metadata
+
+  # Build Requirements
+  if platform.is_cross_compiled_linux?
+    pkg.build_requires "pl-binutils-#{platform.architecture}"
+    pkg.build_requires "pl-gcc-#{platform.architecture}"
+  elsif platform.is_aix?
+    #
+  elsif platform.is_solaris?
+    #
+  elsif platform.is_windows?
+    #
+  elsif platform.is_macos?
+    #
+  else
+    pkg.build_requires "pl-gcc"
+    # Various Linux platforms
+    case platform.name
+    when /el|fedora/
+      pkg.build_requires 'bzip2-devel'
+      pkg.build_requires 'zlib-devel'
+    when /sles-(11|12)/
+      pkg.build_requires 'libbz2-devel'
+      pkg.build_requires 'zlib-devel'
+    when /debian|ubuntu|Cumulus/i
+      pkg.build_requires 'libbz2-dev'
+      pkg.build_requires 'zlib1g-dev'
+    end
+  end
+
+  # Build-time Configuration
+  boost_libs = [ 'atomic', 'chrono', 'container', 'date_time', 'exception', 'filesystem', 'graph', 'graph_parallel', 'iostreams', 'locale', 'log', 'math', 'program_options', 'random', 'regex', 'serialization', 'signals', 'system', 'test', 'thread', 'timer', 'wave' ]
+
+  cflags = "-fPIC -std=c99"
+  cxxflags = "-std=c++11 -fPIC"
+
+  # These are all places where windows differs from *nix. These are the default *nix settings.
+  toolset = 'gcc'
+  with_toolset = "--with-toolset=#{toolset}"
+  boost_dir = ""
+  bootstrap_suffix = ".sh"
+  execute = "./"
+  addtl_flags = ""
+  gpp = "#{settings[:tools_root]}/bin/g++"
+  b2flags = ""
+
+  if platform.is_cross_compiled_linux?
+    pkg.environment "PATH" => "/opt/pl-build-tools/bin:$$PATH"
+    linkflags = "-Wl,-rpath=#{settings[:libdir]}"
+    gpp = "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-g++"
+  elsif platform.is_macos?
+    pkg.environment "PATH" => "/opt/pl-build-tools/bin:$$PATH"
+    linkflags = ""
+    gpp = "clang++"
+    toolset = 'gcc'
+    with_toolset = "--with-toolset=clang"
+  elsif platform.is_solaris?
+    pkg.environment 'PATH', '/opt/pl-build-tools/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:/usr/csw/bin'
+    linkflags = "-Wl,-rpath=#{settings[:libdir]},-L/opt/pl-build-tools/#{settings[:platform_triple]}/lib,-L/usr/lib"
+    b2flags = "define=_XOPEN_SOURCE=600"
+    if platform.architecture == "sparc"
+      b2flags = "#{b2flags} instruction-set=v9"
+    end
+    gpp = "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-g++"
+  elsif platform.is_windows?
+    arch = platform.architecture == "x64" ? "64" : "32"
+    pkg.environment "PATH" => "C:/tools/mingw#{arch}/bin:$$PATH"
+    pkg.environment "CYGWIN" => "nodosfilewarning"
+
+    # bootstrap.bat does not take the `--with-toolset` flag
+    toolset = "gcc"
+    with_toolset = ""
+    # boost is installed with this extra subdirectory on windows
+    boost_dir = "boost-1_67"
+    # we do not need to reference the .bat suffix when calling the bootstrap script
+    bootstrap_suffix = ""
+    # we need to make sure we link against non-cygwin libraries
+    execute = "cmd.exe /c "
+
+    gpp = "C:/tools/mingw#{arch}/bin/g++"
+
+    # We don't have iconv available on windows yet
+    addtl_flags = "boost.locale.iconv=off"
+  elsif platform.is_aix?
+    pkg.environment "PATH" => "/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)"
+    linkflags = "-Wl,-L#{settings[:libdir]},-L/opt/pl-build-tools/lib"
+  else
+    pkg.environment "PATH" => "#{settings[:bindir]}:$$PATH"
+    linkflags = "-Wl,-rpath=#{settings[:libdir]},-rpath=#{settings[:libdir]}64"
+  end
+
+  # Set user-config.jam
+  if platform.is_windows?
+    userconfigjam = %Q{using gcc : : #{gpp} ;}
+  else
+    if platform.architecture =~ /arm|s390x/ || platform.is_aix?
+      userconfigjam = %Q{using gcc : 5.2.0 : #{gpp} : <linkflags>"#{linkflags}" <cflags>"#{cflags}" <cxxflags>"#{cxxflags}" ;}
+    else
+      userconfigjam = %Q{using gcc : 4.8.2 : #{gpp} : <linkflags>"#{linkflags}" <cflags>"#{cflags}" <cxxflags>"#{cxxflags}" ;}
+    end
+  end
+
+  # Build Commands
+
+  # On some platforms, we have multiple means of specifying paths. Sometimes, we need to use either one
+  # form or another. `special_prefix` allows us to do this. i.e., on windows, we need to have the
+  # windows specific path (C:/), whereas for everything else, we can default to the drive root currently
+  # in use (/cygdrive/c). This has to do with how the program is built, where it is expecting to find
+  # libraries and binaries, and how it tries to find them.
+  pkg.build do
+    [
+      %Q{echo '#{userconfigjam}' > ~/user-config.jam},
+      "cd tools/build",
+      "#{execute}bootstrap#{bootstrap_suffix} #{with_toolset}",
+      "./b2 install -d+2 \
+      --prefix=#{settings[:prefix]} \
+      toolset=#{toolset} \
+      #{b2flags} \
+      --debug-configuration"
+    ]
+  end
+
+  pkg.install do
+    [ "#{settings[:prefix]}/bin/b2 \
+    -d+2 \
+    toolset=#{toolset} \
+    #{b2flags} \
+    --debug-configuration \
+    --build-dir=. \
+    --prefix=#{settings[:prefix]} \
+    #{boost_libs.map {|lib| "--with-#{lib}"}.join(" ")} \
+    #{addtl_flags} \
+    install",
+    "chmod 0644 #{settings[:includedir]}/#{boost_dir}/boost/graph/vf2_sub_graph_iso.hpp",
+    "chmod 0644 #{settings[:includedir]}/#{boost_dir}/boost/thread/v2/shared_mutex.hpp",
+    # Remove the user-config.jam from the build user's home directory:
+    "rm -f ~/user-config.jam"
+    ]
+  end
+end

Diff for: configs/components/libedit.rb

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

Diff for: configs/components/openssl.rb

@@ -36,8 +36,7 @@
                'linux64-s390x'
              end
   elsif platform.is_aix?
-    pkg.environment 'CC', '/opt/pl-build-tools/bin/gcc'
-
+    pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
     cflags = '$${CFLAGS} -static-libgcc'
     target = 'aix-gcc'
   elsif platform.is_solaris?
@@ -76,7 +75,7 @@
     pkg.build_requires 'xorg-x11-util-devel' if platform.name =~ /^sles/
     pkg.build_requires 'xutils-dev' if platform.is_deb?
   elsif platform.is_aix?
-    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"
+    # Do nothing, aix requirements are included in platform file
   elsif platform.is_macos?
     pkg.build_requires 'makedepend'
   elsif platform.is_cross_compiled_linux?

Diff for: configs/components/ruby-2.4.4.rb

@@ -88,8 +88,6 @@
   ####################
 
   if platform.is_aix?
-    pkg.build_requires 'http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/zlib-1.2.3-4.aix5.2.ppc.rpm'
-
     # TODO: Remove this once PA-1607 is resolved.
     pkg.build_requires 'http://pl-build-tools.delivery.puppetlabs.net/aix/5.3/ppc/pl-autoconf-2.69-1.aix5.3.ppc.rpm'
   end
@@ -169,6 +167,7 @@
   ###########
 
   # TODO: Remove this once PA-1607 is resolved.
+  # TODO: Can we use native autoconf? The dependencies seemed a little too extensive
   pkg.configure { ["/opt/pl-build-tools/bin/autoconf"] } if platform.is_aix?
 
   # Here we set --enable-bundled-libyaml to ensure that the libyaml included in

Diff for: configs/components/runtime-agent.rb

@@ -15,7 +15,6 @@
     pkg.build_requires "pl-binutils-#{platform.architecture}"
     pkg.build_requires "pl-gcc-#{platform.architecture}"
   elsif platform.is_aix?
-    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"
     libdir = "/opt/pl-build-tools/lib/gcc/powerpc-ibm-aix#{platform.os_version}.0.0/5.2.0/"
   elsif platform.is_windows?
     # We only need zlib because curl is dynamically linking against zlib

Diff for: configs/components/yaml-cpp.rb

@@ -0,0 +1,96 @@
+component "yaml-cpp" do |pkg, settings, platform|
+  pkg.url "git://github.com/jbeder/yaml-cpp.git"
+  pkg.ref "refs/tags/yaml-cpp-0.6.2"
+
+  # Build Requirements
+  if platform.is_cross_compiled_linux?
+    pkg.build_requires "pl-binutils-#{platform.architecture}"
+    pkg.build_requires "pl-gcc-#{platform.architecture}"
+    pkg.build_requires "pl-cmake"
+  elsif platform.is_solaris?
+    if platform.os_version == "10"
+      pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/solaris/10/pl-cmake-3.2.3-15.i386.pkg.gz"
+    elsif platform.os_version == "11"
+      pkg.build_requires "pl-binutils-#{platform.architecture}"
+      pkg.build_requires "pl-gcc-#{platform.architecture}"
+      pkg.build_requires "pl-cmake"
+    end
+  elsif platform.is_windows?
+    pkg.build_requires "pl-toolchain-#{platform.architecture}"
+    pkg.build_requires "cmake"
+  elsif platform.is_macos?
+    pkg.build_requires "cmake"
+  elsif platform.is_aix?
+    # Moved to platform def, do nothing
+  else
+    pkg.build_requires "pl-gcc"
+    pkg.build_requires "make"
+    pkg.build_requires "pl-cmake"
+  end
+
+  # Build-time Configuration
+  cmake = "#{settings[:tools_root]}/bin/cmake"
+  cmake_toolchain_file = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
+  make = 'make'
+  mkdir = 'mkdir'
+
+  if platform.is_cross_compiled_linux?
+    # We're using the x86_64 version of cmake
+    cmake = "/opt/pl-build-tools/bin/cmake"
+    cmake_toolchain_file = "-DPL_TOOLS_ROOT=/opt/freeware -DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/#{settings[:platform_triple]}/pl-build-toolchain.cmake"
+  elsif platform.is_solaris?
+    if platform.os_version == "11"
+      make = '/usr/bin/gmake'
+    end
+    # We always use the i386 build of cmake, even on sparc
+    cmake = "/opt/pl-build-tools/i386-pc-solaris2.#{platform.os_version}/bin/cmake"
+    cmake_toolchain_file = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/#{settings[:platform_triple]}/pl-build-toolchain.cmake"
+    pkg.environment "PATH" => "$$PATH:/opt/csw/bin"
+  elsif platform.is_macos?
+    cmake_toolchain_file = ""
+    cmake = "/usr/local/bin/cmake"
+  elsif platform.is_windows?
+    make = "#{settings[:gcc_bindir]}/mingw32-make"
+    mkdir = '/usr/bin/mkdir'
+    pkg.environment "PATH", "$(shell cygpath -u #{settings[:gcc_bindir]}):$(shell cygpath -u #{settings[:ruby_bindir]}):/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0"
+    pkg.environment "CYGWIN", settings[:cygwin]
+    cmake = "C:/ProgramData/chocolatey/bin/cmake.exe -G \"MinGW Makefiles\""
+    cmake_toolchain_file = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
+  end
+
+  # Build Commands
+  pkg.build do
+    [ "#{mkdir} build-shared",
+      "cd build-shared",
+      "#{cmake} \
+      #{cmake_toolchain_file} \
+      -DCMAKE_INSTALL_PREFIX=#{settings[:prefix]} \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DYAML_CPP_BUILD_TOOLS=0 \
+      -DYAML_CPP_BUILD_TESTS=0 \
+      -DBUILD_SHARED_LIBS=ON \
+      .. ",
+      "#{make} VERBOSE=1 -j$(shell expr $(shell #{platform[:num_cores]}) + 1)",
+      "cd ../",
+      "#{mkdir} build-static",
+      "cd build-static",
+      "#{cmake} \
+      #{cmake_toolchain_file} \
+      -DCMAKE_INSTALL_PREFIX=#{settings[:prefix]} \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DYAML_CPP_BUILD_TOOLS=0 \
+      -DYAML_CPP_BUILD_TESTS=0 \
+      -DBUILD_SHARED_LIBS=OFF \
+      ..",
+      "#{make} VERBOSE=1 -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"
+    ]
+  end
+
+  pkg.install do
+    [ "cd build-shared",
+      "#{make} install",
+      "cd ../build-static",
+      "#{make} install"
+    ]
+  end
+end

Diff for: configs/platforms/aix-6.1-ppc.rb

@@ -6,8 +6,29 @@
   plat.rpmbuild "/usr/bin/rpm"
   plat.patch "/opt/freeware/bin/patch"
 
-  # Basic vanagon operations require mktemp, rsync, coreutils, make, tar and sed so leave this in there
-  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"
+  os_version = 6.1
+  # We can't rely on yum, and rpm can't download over https on AIX, so curl packages before installing them
+  # Order matters here - there is no automatic dependency resolution
+  packages = [
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_oss4aix.org/RPMS/mktemp/mktemp-1.7-1.aix5.1.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/rsync/rsync-3.0.6-1.aix5.3.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/coreutils/coreutils-5.2.1-2.aix5.1.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/sed/sed-4.1.1-1.aix5.1.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/make/make-3.80-1.aix5.1.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/tar/tar-1.22-1.aix6.1.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/pkg-config/pkg-config-0.19-6.aix5.2.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/zlib/zlib-1.2.3-4.aix5.2.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/zlib/zlib-devel-1.2.3-4.aix5.2.ppc.rpm",
+    "https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/gawk/gawk-3.1.3-1.aix5.1.ppc.rpm",
+    "http://pl-build-tools.delivery.puppetlabs.net/aix/#{os_version}/ppc/pl-gcc-5.2.0-11.aix#{os_version}.ppc.rpm",
+    "http://pl-build-tools.delivery.puppetlabs.net/aix/#{os_version}/ppc/pl-cmake-3.2.3-2.aix#{os_version}.ppc.rpm",
+  ]
+
+  packages.each do |uri|
+    name = uri.split("/").last
+    plat.provision_with("curl -O #{uri} > /dev/null")
+    plat.provision_with("rpm -Uvh --replacepkgs --nodeps #{name}")
+  end
 
   # We use --force with rpm because the pl-gettext and pl-autoconf
   # packages conflict with a charset.alias file.