Commit 39055207 authored by Michael Catanzaro's avatar Michael Catanzaro Committed by Abderrahim Kitouni

Remove our custom autogen steps

buildstream now works the way we expect.
parent 32703f9c
Pipeline #122046 passed with stages
in 210 minutes and 13 seconds
......@@ -7,5 +7,4 @@ build-depends:
depends:
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: dist/
conf-cmd: ./dist/configure
......@@ -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
......@@ -10,4 +10,3 @@ depends:
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
make: make -j1
conf-aux: autoconf
......@@ -8,5 +8,3 @@ depends:
- core-deps/exiv2.bst
- sdk/glib.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: build-aux
......@@ -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:
......
......@@ -9,4 +9,3 @@ depends:
variables:
conf-local: >-
--disable-nftables
conf-aux: build-aux
......@@ -7,5 +7,3 @@ build-depends:
depends:
- freedesktop-sdk.bst:components/systemd.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: build-aux
......@@ -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
......@@ -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
......@@ -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
......@@ -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:
(>):
......
......@@ -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
......@@ -15,4 +15,3 @@ variables:
--with-staticdir=%{sbindir}
--with-usrlibdir=%{libdir}
--with-usrsbindir=%{sbindir}
conf-aux: autoconf
......@@ -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
......@@ -8,8 +8,6 @@ build-depends:
depends:
- core-deps/berkeleydb.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: build
config:
install-commands:
(>):
......
......@@ -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
......@@ -21,4 +21,3 @@ variables:
--disable-smartcard
--enable-vala
--enable-webdav
conf-aux: build-aux
......@@ -12,5 +12,3 @@ depends:
- core-deps/libgudev.bst
- core-deps/polkit.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: build-aux
......@@ -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
......@@ -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
......@@ -9,5 +9,3 @@ build-depends:
depends:
- sdk/glib.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: build-aux
......@@ -11,4 +11,3 @@ depends:
variables:
conf-local: >-
--disable-bdjava-jar
conf-aux: build-aux
......@@ -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
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment