diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-11-23 17:36:18 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-12-04 11:49:55 +0000 |
commit | 6a9f3738dae2818a2e8ebbec7fd6a82231d3b9fd (patch) | |
tree | ffcad27bfa7d4bc7470ce8683caff92a28f03843 /unmaintained | |
parent | 028a6c319204755de025e2ac4523d383bfc75a48 (diff) | |
download | definitions-6a9f3738dae2818a2e8ebbec7fd6a82231d3b9fd.tar.gz |
Fix elements where we can't run autoreconf
BuildStream changed its defaults in be08caa06d6b8ba780aa so that
autoreconf always runs.
A few components need fixing as a result, mostly those which were
not correctly depending on autotools
Diffstat (limited to 'unmaintained')
-rw-r--r-- | unmaintained/strata/openstack-services.morph | 1 | ||||
-rw-r--r-- | unmaintained/strata/openstack-services/sysfsutils.morph | 10 | ||||
-rw-r--r-- | unmaintained/strata/openstack-services/tftp-hpa.morph | 5 | ||||
-rw-r--r-- | unmaintained/strata/test-tools.morph | 1 | ||||
-rw-r--r-- | unmaintained/strata/test-tools/check.morph | 8 |
5 files changed, 25 insertions, 0 deletions
diff --git a/unmaintained/strata/openstack-services.morph b/unmaintained/strata/openstack-services.morph index 18592e76..9bdbf482 100644 --- a/unmaintained/strata/openstack-services.morph +++ b/unmaintained/strata/openstack-services.morph @@ -597,6 +597,7 @@ chunks: - configshell-fb - rtslib-fb - name: sysfsutils + morph: unmaintained/strata/openstack-services/sysfsutils.morph repo: upstream:sysfsutils ref: 237bf36e664db92f95b75067bf0f246726993254 unpetrify-ref: sysfsutils-2_1_0 diff --git a/unmaintained/strata/openstack-services/sysfsutils.morph b/unmaintained/strata/openstack-services/sysfsutils.morph new file mode 100644 index 00000000..2f388a32 --- /dev/null +++ b/unmaintained/strata/openstack-services/sysfsutils.morph @@ -0,0 +1,10 @@ +name: sysfsutils +kind: chunk + +build-system: autotools + +configure-commands: +# Rerunning autoreconf requires on something to provide the AC_CHECK_KLIBC +# autoconf macro, which we don't have for whatever reason. So use the +# embedded configure script. +- ./configure --prefix="$PREFIX" diff --git a/unmaintained/strata/openstack-services/tftp-hpa.morph b/unmaintained/strata/openstack-services/tftp-hpa.morph index d466d2d4..b8fab451 100644 --- a/unmaintained/strata/openstack-services/tftp-hpa.morph +++ b/unmaintained/strata/openstack-services/tftp-hpa.morph @@ -1,5 +1,10 @@ name: tftp-hpa build-system: autotools kind: chunk +configure-commands: +# There is an autogen.sh script in the tree which doesn't work, +# so the default commands don't work here. +- autoreconf -ivf +- ./configure --prefix="%{prefix}" install-commands: - make INSTALLROOT="$DESTDIR" install diff --git a/unmaintained/strata/test-tools.morph b/unmaintained/strata/test-tools.morph index fe47cd38..08876936 100644 --- a/unmaintained/strata/test-tools.morph +++ b/unmaintained/strata/test-tools.morph @@ -10,6 +10,7 @@ chunks: unpetrify-ref: master build-system: python-distutils - name: check + morph: unmaintained/strata/test-tools/check.morph repo: upstream:check ref: 8c872aca6675e95fa47e7514e28fbdf25fce6170 unpetrify-ref: 0.9.8 diff --git a/unmaintained/strata/test-tools/check.morph b/unmaintained/strata/test-tools/check.morph new file mode 100644 index 00000000..a9d8bbba --- /dev/null +++ b/unmaintained/strata/test-tools/check.morph @@ -0,0 +1,8 @@ +name: check +kind: chunk +build-system: autotools + +configure-commands: +# autoreconf fails for this component for some reason, so just run the +# configure script that they have committed to SVN +- ./configure --prefix="$PREFIX" |