From 1e0205a76091d0db1f17d3458ac3c9da673e6806 Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni Date: Thu, 17 May 2018 18:00:09 +0100 Subject: [PATCH] core-deps: Set conf-aux for more elements also set autogen to '' for elements that are mostly compatible with autotools but aren't autotools. This was uncovered by df80f598134c71179beef469513939141f4a775e --- elements/core-deps/cairomm-1.0.bst | 2 ++ elements/core-deps/gexiv2.bst | 2 ++ elements/core-deps/gpgme.bst | 2 ++ elements/core-deps/graphviz.bst | 2 ++ elements/core-deps/iptables.bst | 1 + elements/core-deps/kmod.bst | 2 ++ elements/core-deps/libbluray.bst | 1 + elements/core-deps/libcanberra.bst | 2 ++ elements/core-deps/libevdev.bst | 2 ++ elements/core-deps/libgphoto2.bst | 2 ++ elements/core-deps/libndp.bst | 2 ++ elements/core-deps/libnl.bst | 2 ++ elements/core-deps/libvirt.bst | 2 ++ elements/core-deps/lvm2.bst | 1 + elements/core-deps/pam.bst | 1 + elements/core-deps/parted.bst | 2 ++ elements/core-deps/ppp.bst | 2 ++ elements/core-deps/spice-gtk.bst | 1 + elements/core-deps/udisks2.bst | 2 ++ elements/core-deps/vala-tarball.bst | 2 ++ elements/core-deps/volume-key.bst | 2 ++ 21 files changed, 37 insertions(+) diff --git a/elements/core-deps/cairomm-1.0.bst b/elements/core-deps/cairomm-1.0.bst index 5c206f2ab0..39e4a15e60 100644 --- a/elements/core-deps/cairomm-1.0.bst +++ b/elements/core-deps/cairomm-1.0.bst @@ -8,3 +8,5 @@ depends: junction: freedesktop-sdk.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build diff --git a/elements/core-deps/gexiv2.bst b/elements/core-deps/gexiv2.bst index acfea89706..9e43c24cc7 100644 --- a/elements/core-deps/gexiv2.bst +++ b/elements/core-deps/gexiv2.bst @@ -6,3 +6,5 @@ depends: - core-deps/exiv2.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/gpgme.bst b/elements/core-deps/gpgme.bst index 3be770246f..5875e44d47 100644 --- a/elements/core-deps/gpgme.bst +++ b/elements/core-deps/gpgme.bst @@ -5,3 +5,5 @@ sources: depends: - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/graphviz.bst b/elements/core-deps/graphviz.bst index 2fde7fa281..bb30a1a860 100644 --- a/elements/core-deps/graphviz.bst +++ b/elements/core-deps/graphviz.bst @@ -7,6 +7,8 @@ depends: - core-deps/pango.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: config public: bst: integration-commands: diff --git a/elements/core-deps/iptables.bst b/elements/core-deps/iptables.bst index 9eff74364e..5bf3cf72f6 100644 --- a/elements/core-deps/iptables.bst +++ b/elements/core-deps/iptables.bst @@ -7,3 +7,4 @@ depends: junction: freedesktop-sdk.bst variables: conf-local: --disable-nftables + conf-aux: build-aux diff --git a/elements/core-deps/kmod.bst b/elements/core-deps/kmod.bst index c268f7a4eb..73b0fa6f11 100644 --- a/elements/core-deps/kmod.bst +++ b/elements/core-deps/kmod.bst @@ -5,3 +5,5 @@ sources: depends: - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/libbluray.bst b/elements/core-deps/libbluray.bst index 11229d79b4..09418078d9 100644 --- a/elements/core-deps/libbluray.bst +++ b/elements/core-deps/libbluray.bst @@ -11,3 +11,4 @@ depends: junction: freedesktop-sdk.bst variables: conf-local: --disable-bdjava-jar + conf-aux: build-aux diff --git a/elements/core-deps/libcanberra.bst b/elements/core-deps/libcanberra.bst index 61389b7073..bde8cd14d1 100644 --- a/elements/core-deps/libcanberra.bst +++ b/elements/core-deps/libcanberra.bst @@ -10,3 +10,5 @@ depends: junction: freedesktop-sdk.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/libevdev.bst b/elements/core-deps/libevdev.bst index 730d79a224..994c6b078d 100644 --- a/elements/core-deps/libevdev.bst +++ b/elements/core-deps/libevdev.bst @@ -5,3 +5,5 @@ sources: depends: - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/libgphoto2.bst b/elements/core-deps/libgphoto2.bst index 1e23afd68b..181d657db8 100644 --- a/elements/core-deps/libgphoto2.bst +++ b/elements/core-deps/libgphoto2.bst @@ -5,3 +5,5 @@ sources: depends: - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: auto-aux diff --git a/elements/core-deps/libndp.bst b/elements/core-deps/libndp.bst index 7c75185d25..91862bd010 100644 --- a/elements/core-deps/libndp.bst +++ b/elements/core-deps/libndp.bst @@ -5,3 +5,5 @@ sources: depends: - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/libnl.bst b/elements/core-deps/libnl.bst index e90fde9a01..9d7a6e179a 100644 --- a/elements/core-deps/libnl.bst +++ b/elements/core-deps/libnl.bst @@ -5,3 +5,5 @@ sources: depends: - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/libvirt.bst b/elements/core-deps/libvirt.bst index 7911543ff7..9a6c0665a2 100644 --- a/elements/core-deps/libvirt.bst +++ b/elements/core-deps/libvirt.bst @@ -9,3 +9,5 @@ depends: - core-deps/lvm2.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/lvm2.bst b/elements/core-deps/lvm2.bst index 57916bccb6..c933b0e030 100644 --- a/elements/core-deps/lvm2.bst +++ b/elements/core-deps/lvm2.bst @@ -9,3 +9,4 @@ variables: conf-local: --enable-dmeventd --enable-cmdlib --enable-pkgconfig --with-confdir=%{sysconfdir} --with-staticdir=%{sbindir} --with-usrlibdir=%{libdir} --with-usrsbindir=%{sbindir} + conf-aux: autoconf diff --git a/elements/core-deps/pam.bst b/elements/core-deps/pam.bst index 86d78ec774..490a73e969 100644 --- a/elements/core-deps/pam.bst +++ b/elements/core-deps/pam.bst @@ -8,3 +8,4 @@ depends: variables: # polkit expects the headers there, and the configure script tries to put them there but is buggy conf-local: --includedir=/usr/include/security + conf-aux: build-aux diff --git a/elements/core-deps/parted.bst b/elements/core-deps/parted.bst index 9f26acfaa0..d8c4d4aaf5 100644 --- a/elements/core-deps/parted.bst +++ b/elements/core-deps/parted.bst @@ -6,3 +6,5 @@ depends: - core-deps/lvm2.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/ppp.bst b/elements/core-deps/ppp.bst index 7d94ae2b9d..9a64c78161 100644 --- a/elements/core-deps/ppp.bst +++ b/elements/core-deps/ppp.bst @@ -6,4 +6,6 @@ depends: - filename: base.bst junction: freedesktop-sdk.bst variables: + # not a real autotools project + autogen: '' make-install: make -j1 INSTROOT="%{install-root}" install diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst index d0c762c2f3..58120c17d5 100644 --- a/elements/core-deps/spice-gtk.bst +++ b/elements/core-deps/spice-gtk.bst @@ -13,3 +13,4 @@ depends: junction: freedesktop-sdk.bst variables: conf-local: --disable-smartcard --enable-vala --enable-webdav + conf-aux: build-aux diff --git a/elements/core-deps/udisks2.bst b/elements/core-deps/udisks2.bst index 982d22fb57..e944049cd5 100644 --- a/elements/core-deps/udisks2.bst +++ b/elements/core-deps/udisks2.bst @@ -9,3 +9,5 @@ depends: - core-deps/polkit.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/vala-tarball.bst b/elements/core-deps/vala-tarball.bst index c5f9029e4f..d5b4731466 100644 --- a/elements/core-deps/vala-tarball.bst +++ b/elements/core-deps/vala-tarball.bst @@ -6,3 +6,5 @@ depends: - core-deps/graphviz.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: build-aux diff --git a/elements/core-deps/volume-key.bst b/elements/core-deps/volume-key.bst index 50d342a7e7..05379c6190 100644 --- a/elements/core-deps/volume-key.bst +++ b/elements/core-deps/volume-key.bst @@ -9,3 +9,5 @@ depends: - core-deps/gpgme.bst - filename: base.bst junction: freedesktop-sdk.bst +variables: + conf-aux: admin -- GitLab