From 6a9f3738dae2818a2e8ebbec7fd6a82231d3b9fd Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 23 Nov 2017 17:36:18 +0000 Subject: 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 --- strata/NetworkManager-common.morph | 1 + strata/NetworkManager-common/readline6.morph | 8 ++++++++ strata/core.morph | 10 ++++++++++ strata/core/gperf.morph | 2 ++ strata/core/readline.morph | 3 ++- strata/devtools.morph | 1 + strata/devtools/pv.morph | 5 +++++ strata/foundation/rsync.morph | 2 ++ strata/glib-common.morph | 2 +- strata/glib-common/gtk-doc-stub.morph | 8 ++++++++ unmaintained/strata/openstack-services.morph | 1 + unmaintained/strata/openstack-services/sysfsutils.morph | 10 ++++++++++ unmaintained/strata/openstack-services/tftp-hpa.morph | 5 +++++ unmaintained/strata/test-tools.morph | 1 + unmaintained/strata/test-tools/check.morph | 8 ++++++++ 15 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 strata/NetworkManager-common/readline6.morph create mode 100644 strata/devtools/pv.morph create mode 100644 strata/glib-common/gtk-doc-stub.morph create mode 100644 unmaintained/strata/openstack-services/sysfsutils.morph create mode 100644 unmaintained/strata/test-tools/check.morph diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 28a0f3bb..b1b47e5d 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -32,6 +32,7 @@ chunks: unpetrify-ref: v1.6 build-system: autotools - name: readline6 + morph: strata/NetworkManager-common/readline6.morph repo: upstream:readline ref: 7628b745a813aac53586b640da056a975f1c443e unpetrify-ref: readline-6.3 diff --git a/strata/NetworkManager-common/readline6.morph b/strata/NetworkManager-common/readline6.morph new file mode 100644 index 00000000..e3776357 --- /dev/null +++ b/strata/NetworkManager-common/readline6.morph @@ -0,0 +1,8 @@ +name: readline6 +kind: chunk +build-system: autotools + +configure-commands: +# Skip the autoreconf step, it's broken for some reason and the generated +# files are committed to the Git repo. +- ./configure --prefix="$PREFIX" diff --git a/strata/core.morph b/strata/core.morph index 24f892c0..2d2c0253 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -80,6 +80,10 @@ chunks: ref: 670c2bbcffe873a2b8589ed140c12e7923ef20c0 unpetrify-ref: file-5.22 build-system: autotools + build-depends: + - autoconf + - automake + - libtool-tarball - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat @@ -124,6 +128,10 @@ chunks: ref: 24adc227bc29cd17e39df097fbca389c7724cd14 unpetrify-ref: sqlite-autoconf-3080801 build-system: autotools + build-depends: + - autoconf + - automake + - libtool-tarball - name: python3 morph: strata/core/python3.morph repo: upstream:cpython @@ -457,6 +465,8 @@ chunks: unpetrify-ref: baserock/morph build-system: autotools build-depends: + - autoconf + - automake - perl - flex - texinfo-tarball diff --git a/strata/core/gperf.morph b/strata/core/gperf.morph index e4f598c5..ca515880 100644 --- a/strata/core/gperf.morph +++ b/strata/core/gperf.morph @@ -1,3 +1,5 @@ name: gperf kind: chunk build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" diff --git a/strata/core/readline.morph b/strata/core/readline.morph index 08c9586c..3a63a5c4 100644 --- a/strata/core/readline.morph +++ b/strata/core/readline.morph @@ -1,8 +1,9 @@ name: readline kind: chunk build-system: autotools -pre-configure-commands: +configure-commands: - cp /usr/share/automake*/config.guess support - cp /usr/share/automake*/config.sub support +- ./configure --prefix="$PREFIX" build-commands: - make SHLIB_LIBS=-lncurses diff --git a/strata/devtools.morph b/strata/devtools.morph index 41dd501c..57fa7e3a 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -21,6 +21,7 @@ chunks: ref: 07c2c06799e0579e6bfb1a7d98acf38e36a98f79 unpetrify-ref: baserock/morph - name: pv + morph: strata/devtools/pv.morph repo: upstream:pv ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a unpetrify-ref: baserock/morph diff --git a/strata/devtools/pv.morph b/strata/devtools/pv.morph new file mode 100644 index 00000000..392bff6a --- /dev/null +++ b/strata/devtools/pv.morph @@ -0,0 +1,5 @@ +name: pv +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" diff --git a/strata/foundation/rsync.morph b/strata/foundation/rsync.morph index 54337412..0060e386 100644 --- a/strata/foundation/rsync.morph +++ b/strata/foundation/rsync.morph @@ -1,6 +1,8 @@ name: rsync kind: chunk build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" build-commands: - make proto - make diff --git a/strata/glib-common.morph b/strata/glib-common.morph index fd1018a3..bbeb8f3c 100644 --- a/strata/glib-common.morph +++ b/strata/glib-common.morph @@ -6,10 +6,10 @@ build-depends: - morph: strata/pcre-utils.morph chunks: - name: gtk-doc-stub + morph: strata/glib-common/gtk-doc-stub.morph repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 unpetrify-ref: baserock/morph - build-system: autotools - name: gnome-common repo: upstream:gnome-common ref: 5d61b55e8bea32fe2b52e21682ee4b3719b290c5 diff --git a/strata/glib-common/gtk-doc-stub.morph b/strata/glib-common/gtk-doc-stub.morph new file mode 100644 index 00000000..89abc97b --- /dev/null +++ b/strata/glib-common/gtk-doc-stub.morph @@ -0,0 +1,8 @@ +name: gtk-doc-stub +kind: chunk +build-system: autotools + +# This package doesn't actually use Autotools, it has a hand-written +# `configure` script and Makefile. +configure-commands: +- ./configure --prefix="$PREFIX" 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" -- cgit v1.2.1