GNOME.org
 

[gnome-build-meta/mcatanzaro/custom-autogen] Remove our custom autogen steps

commit 02a8be253a0eb457f18a96a85fa880ce02238d56
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Oct 7 11:50:24 2019 -0500

    Remove our custom autogen steps
    
    buildstream now works the way we expect.

 elements/core-deps/berkeleydb.bst  |  1 -
 elements/core-deps/cairomm-1.0.bst |  2 --
 elements/core-deps/dmraid.bst      |  1 -
 elements/core-deps/gexiv2.bst      |  2 --
 elements/core-deps/graphviz.bst    |  2 --
 elements/core-deps/iptables.bst    |  1 -
 elements/core-deps/libatasmart.bst |  2 --
 elements/core-deps/libevdev.bst    |  2 --
 elements/core-deps/libndp.bst      |  2 --
 elements/core-deps/libnl.bst       |  2 --
 elements/core-deps/libvirt.bst     |  2 --
 elements/core-deps/libxklavier.bst |  2 --
 elements/core-deps/lvm2.bst        |  1 -
 elements/core-deps/mtdev.bst       |  2 --
 elements/core-deps/openldap.bst    |  2 --
 elements/core-deps/parted.bst      |  2 --
 elements/core-deps/spice-gtk.bst   |  1 -
 elements/core-deps/udisks2.bst     |  2 --
 elements/core-deps/volume-key.bst  |  1 -
 elements/sdk/libcanberra.bst       |  2 --
 elements/sdk/vala-tarball.bst      |  2 --
 elements/world/libbluray.bst       |  1 -
 elements/world/libgphoto2.bst      |  2 --
 project.conf                       | 21 ---------------------
 24 files changed, 60 deletions(-)
---
diff --git a/elements/core-deps/berkeleydb.bst b/elements/core-deps/berkeleydb.bst
index 0aadda05..aba5cd73 100644
--- a/elements/core-deps/berkeleydb.bst
+++ b/elements/core-deps/berkeleydb.bst
@@ -7,5 +7,4 @@ build-depends:
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
-  conf-aux: dist/
   conf-cmd: ./dist/configure
diff --git a/elements/core-deps/cairomm-1.0.bst b/elements/core-deps/cairomm-1.0.bst
index 9eb19d64..cef20856 100644
--- a/elements/core-deps/cairomm-1.0.bst
+++ b/elements/core-deps/cairomm-1.0.bst
@@ -8,5 +8,3 @@ depends:
 - core-deps/libsigcplusplus-2.0.bst
 - freedesktop-sdk.bst:components/cairo.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build
diff --git a/elements/core-deps/dmraid.bst b/elements/core-deps/dmraid.bst
index 942afdd5..6ae4b7fd 100644
--- a/elements/core-deps/dmraid.bst
+++ b/elements/core-deps/dmraid.bst
@@ -10,4 +10,3 @@ depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   make: make -j1
-  conf-aux: autoconf
diff --git a/elements/core-deps/gexiv2.bst b/elements/core-deps/gexiv2.bst
index 058ab613..071be3d2 100644
--- a/elements/core-deps/gexiv2.bst
+++ b/elements/core-deps/gexiv2.bst
@@ -8,5 +8,3 @@ depends:
 - core-deps/exiv2.bst
 - sdk/glib.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/graphviz.bst b/elements/core-deps/graphviz.bst
index b3d1546b..2ab9b22e 100644
--- a/elements/core-deps/graphviz.bst
+++ b/elements/core-deps/graphviz.bst
@@ -9,8 +9,6 @@ depends:
 - sdk/pango.bst
 - freedesktop-sdk.bst:components/libtool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: config
 public:
   bst:
     integration-commands:
diff --git a/elements/core-deps/iptables.bst b/elements/core-deps/iptables.bst
index 917212bb..882be054 100644
--- a/elements/core-deps/iptables.bst
+++ b/elements/core-deps/iptables.bst
@@ -9,4 +9,3 @@ depends:
 variables:
   conf-local: >-
     --disable-nftables
-  conf-aux: build-aux
diff --git a/elements/core-deps/libatasmart.bst b/elements/core-deps/libatasmart.bst
index aa6bdd36..01e63ef9 100644
--- a/elements/core-deps/libatasmart.bst
+++ b/elements/core-deps/libatasmart.bst
@@ -7,5 +7,3 @@ build-depends:
 depends:
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/libevdev.bst b/elements/core-deps/libevdev.bst
index 787dbcc5..a575fa66 100644
--- a/elements/core-deps/libevdev.bst
+++ b/elements/core-deps/libevdev.bst
@@ -7,5 +7,3 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/libndp.bst b/elements/core-deps/libndp.bst
index 0f23810a..8105f291 100644
--- a/elements/core-deps/libndp.bst
+++ b/elements/core-deps/libndp.bst
@@ -6,5 +6,3 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/libnl.bst b/elements/core-deps/libnl.bst
index 83516a49..d7a05657 100644
--- a/elements/core-deps/libnl.bst
+++ b/elements/core-deps/libnl.bst
@@ -8,5 +8,3 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/libvirt.bst b/elements/core-deps/libvirt.bst
index d5039815..9cc88f3d 100644
--- a/elements/core-deps/libvirt.bst
+++ b/elements/core-deps/libvirt.bst
@@ -14,8 +14,6 @@ depends:
 - freedesktop-sdk.bst:components/libtirpc.bst
 - freedesktop-sdk.bst:components/libxml2.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
 config:
   install-commands:
     (>):
diff --git a/elements/core-deps/libxklavier.bst b/elements/core-deps/libxklavier.bst
index 1b4082a0..3c644331 100644
--- a/elements/core-deps/libxklavier.bst
+++ b/elements/core-deps/libxklavier.bst
@@ -12,5 +12,3 @@ depends:
 - freedesktop-sdk.bst:components/xorg-lib-x11.bst
 - freedesktop-sdk.bst:components/xorg-lib-xi.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/lvm2.bst b/elements/core-deps/lvm2.bst
index 57a40d7f..2046b9ab 100644
--- a/elements/core-deps/lvm2.bst
+++ b/elements/core-deps/lvm2.bst
@@ -15,4 +15,3 @@ variables:
     --with-staticdir=%{sbindir}
     --with-usrlibdir=%{libdir}
     --with-usrsbindir=%{sbindir}
-  conf-aux: autoconf
diff --git a/elements/core-deps/mtdev.bst b/elements/core-deps/mtdev.bst
index ba952bf8..8646727f 100644
--- a/elements/core-deps/mtdev.bst
+++ b/elements/core-deps/mtdev.bst
@@ -6,5 +6,3 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: config-aux
diff --git a/elements/core-deps/openldap.bst b/elements/core-deps/openldap.bst
index 01e42b3d..c7c7da6f 100644
--- a/elements/core-deps/openldap.bst
+++ b/elements/core-deps/openldap.bst
@@ -8,8 +8,6 @@ build-depends:
 depends:
 - core-deps/berkeleydb.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build
 config:
   install-commands:
     (>):
diff --git a/elements/core-deps/parted.bst b/elements/core-deps/parted.bst
index 1dc1a8f2..77c91a5b 100644
--- a/elements/core-deps/parted.bst
+++ b/elements/core-deps/parted.bst
@@ -10,5 +10,3 @@ depends:
 - core-deps/lvm2.bst
 - freedesktop-sdk.bst:components/util-linux.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst
index e96fad28..4b04e570 100644
--- a/elements/core-deps/spice-gtk.bst
+++ b/elements/core-deps/spice-gtk.bst
@@ -21,4 +21,3 @@ variables:
     --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 342cd4f4..8db08db7 100644
--- a/elements/core-deps/udisks2.bst
+++ b/elements/core-deps/udisks2.bst
@@ -12,5 +12,3 @@ depends:
 - core-deps/libgudev.bst
 - core-deps/polkit.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/core-deps/volume-key.bst b/elements/core-deps/volume-key.bst
index 06c4091e..5a89ee26 100644
--- a/elements/core-deps/volume-key.bst
+++ b/elements/core-deps/volume-key.bst
@@ -12,7 +12,6 @@ depends:
 - freedesktop-sdk.bst:components/python3.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
-  conf-aux: admin
   conf-local: >-
     --without-python
     --with-python3
diff --git a/elements/sdk/libcanberra.bst b/elements/sdk/libcanberra.bst
index bbf8cd1f..f9464c4c 100644
--- a/elements/sdk/libcanberra.bst
+++ b/elements/sdk/libcanberra.bst
@@ -9,5 +9,3 @@ depends:
 - freedesktop-sdk.bst:components/libpulse.bst
 - freedesktop-sdk.bst:components/libtool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/sdk/vala-tarball.bst b/elements/sdk/vala-tarball.bst
index e7803e42..5ce8cfb4 100644
--- a/elements/sdk/vala-tarball.bst
+++ b/elements/sdk/vala-tarball.bst
@@ -9,5 +9,3 @@ build-depends:
 depends:
 - sdk/glib.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: build-aux
diff --git a/elements/world/libbluray.bst b/elements/world/libbluray.bst
index 7657dd96..b3fdaaad 100644
--- a/elements/world/libbluray.bst
+++ b/elements/world/libbluray.bst
@@ -11,4 +11,3 @@ depends:
 variables:
   conf-local: >-
     --disable-bdjava-jar
-  conf-aux: build-aux
diff --git a/elements/world/libgphoto2.bst b/elements/world/libgphoto2.bst
index ccb6e135..fad2f369 100644
--- a/elements/world/libgphoto2.bst
+++ b/elements/world/libgphoto2.bst
@@ -6,5 +6,3 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  conf-aux: auto-aux
diff --git a/project.conf b/project.conf
index b3874a1d..1aac26e6 100644
--- a/project.conf
+++ b/project.conf
@@ -103,27 +103,6 @@ elements:
     variables:
       conf-global: --disable-static --disable-Werror --host=%{triplet} --build=%{triplet}
 
-      # Temporary workaround to avoid regenerating existing
-      # configure scripts when building tarballs.
-      #
-      # We can remove this after addressing the upstream issue:
-      #
-      #    https://gitlab.com/BuildStream/buildstream/issues/256
-      #
-      # XXX: updating config.{sub,guess} would be still useful in that case
-      # to fix compilation on recent architectures such as aarch64.
-      autogen: |
-        export NOCONFIGURE=1
-        if [ -x %{conf-cmd} ]; then cp -f /usr/share/automake*/config.{sub,guess} %{conf-aux}
-        elif [ -x autogen ]; then ./autogen
-        elif [ -x autogen.sh ]; then ./autogen.sh
-        elif [ -x bootstrap ]; then ./bootstrap
-        elif [ -x bootstrap.sh ]; then ./bootstrap.sh
-        else autoreconf -ivf
-        fi
-      # the directory where config.sub and config.guess are stored
-      conf-aux: .
-
   cmake:
     variables:
       cmake-global: -DCMAKE_BUILD_TYPE=RelWithDebInfo
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]