Merge pull request #346 from GabrielNagy/PA-3006/vendor-boost-sles15

(PA-3006) Vendor boost and yaml-cpp on SLES 15
puppetlabs · Jun 11, 2020 · d3ddb28 · d3ddb28
2 parents 902248d + 5470f53
commit d3ddb28
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/configs/platforms/sles-15-x86_64.rb b/configs/platforms/sles-15-x86_64.rb
@@ -9,7 +9,7 @@
     "aaa_base",
     "autoconf",
     "automake",
-    "gcc",
+    "gcc-c++",
     "java-1_8_0-openjdk-devel",
     "libbz2-devel",
     "make",

diff --git a/configs/projects/agent-runtime-5.5.x.rb b/configs/projects/agent-runtime-5.5.x.rb
@@ -42,9 +42,8 @@
   proj.component 'rubygem-highline'
   proj.component 'rubygem-hiera-eyaml'
   proj.component 'ruby-stomp'
-  # SLES 15 uses the OS distro versions of boost and yaml-cpp:
-  proj.component 'boost' unless platform.name =~ /sles-15/
-  proj.component 'yaml-cpp' unless platform.name =~ /sles-15/
+  proj.component 'boost'
+  proj.component 'yaml-cpp'
 
   proj.component 'openssl-lib' if platform.is_linux?
 end
diff --git a/configs/projects/agent-runtime-master.rb b/configs/projects/agent-runtime-master.rb
@@ -40,7 +40,6 @@
     proj.component 'rubygem-sys-filesystem'
   end
 
-  # SLES 15 uses the OS distro versions of boost and yaml-cpp:
-  proj.component 'boost' unless platform.name =~ /sles-15/
-  proj.component 'yaml-cpp' unless platform.name =~ /sles-15/
+  proj.component 'boost'
+  proj.component 'yaml-cpp'
 end