Skip to content

Commit 901679d

Browse files
committed
(PA-5715) Download release tarballs for libxml2 and libxslt
Previously, we were using internally hosted libxml2 and libxslt tarballs to work around the fact that upstream source tarballs don't contain a configure script. There are two different issues preventing us from generating the configure script: 1. libxml2's configure.ac added a requirement on automake 1.16 to resolve an issue when building using python, but not all of our systems have 1.16 available: AM_INIT_AUTOMAKE([1.16.3 foreign no-dist-gzip dist-xz]) 2. We explicitly disable python, so the automake 1.16.3 requirement isn't actually needed: ./configure --prefix=/opt/puppetlabs/puppet --without-python ... In theory we could patch configure.ac and run `autoreconf -fi`, but we don't have new enough libtool installed on all of our systems. So just install the release tarballs that do contain a configure script.
1 parent 2348249 commit 901679d

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

configs/components/libxml2.rb

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
component "libxml2" do |pkg, settings, platform|
22
pkg.version '2.10.3'
3-
pkg.sha256sum '26d2415e1c23e0aad8ca52358523fc9116a2eb6e4d4ef47577b1635c7cee3d5f'
4-
pkg.url "#{settings[:buildsources_url]}/libxml2-#{pkg.get_version}.tar.gz"
3+
pkg.sha256sum '5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c'
54

6-
# Newer versions of libxml2 either ship as tar.xz or do not ship with a configure file
7-
# and require a newer version of GNU Autotools to generate. This causes problems with
8-
# the older and esoteric (AIX, Solaris) platforms that we support.
9-
# So we generate a configure file manually, compress as tar.gz, and host internally.
5+
libxml2_version_y = pkg.get_version.gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
6+
pkg.url "https://download.gnome.org/sources/libxml2/#{libxml2_version_y}/libxml2-#{pkg.get_version}.tar.xz"
7+
pkg.mirror "#{settings[:buildsources_url]}/libxml2-#{pkg.get_version}.tar.xz"
108

119
if platform.is_aix?
1210
if platform.name == 'aix-7.1-ppc'

configs/components/libxslt.rb

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
component "libxslt" do |pkg, settings, platform|
22
pkg.version '1.1.37'
3-
pkg.sha256sum 'a4ecab265f44e888ed3b39e11c7e925103ef6e26e09d62e9381f26977df96343'
4-
pkg.url "#{settings[:buildsources_url]}/libxslt-v#{pkg.get_version}.tar.gz"
3+
pkg.sha256sum '3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4'
54

6-
# Newer versions of libxslt either ship as tar.xz or do not ship with a configure file
7-
# and require a newer version of GNU Autotools to generate. This causes problems with
8-
# the older and esoteric (AIX, Solaris) platforms that we support.
9-
# So we generate a configure file manually, compress as tar.gz, and host internally.
5+
libxslt_version_y = pkg.get_version.gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
6+
pkg.url "https://download.gnome.org/sources/libxslt/#{libxslt_version_y}/libxslt-#{pkg.get_version}.tar.xz"
7+
pkg.mirror "#{settings[:buildsources_url]}/libxslt-#{pkg.get_version}.tar.xz"
108

119
pkg.build_requires "libxml2"
1210

0 commit comments

Comments
 (0)