diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index 7f115c70162..d0b5c066efa 100644 --- a/.github/workflows/meson.yml +++ b/.github/workflows/meson.yml @@ -24,8 +24,8 @@ env: APT_PACKAGES: | autoconf \ automake \ - meson \ - ninja-build \ + bison \ + flex \ docbook-xsl \ libacl1-dev \ libavahi-client-dev \ @@ -46,6 +46,8 @@ env: libtool-bin \ libtracker-sparql-3.0-dev \ libwrap0-dev \ + meson \ + ninja-build \ systemtap-sdt-dev \ tcpd \ tracker \ @@ -64,10 +66,10 @@ jobs: run: | apt-get update apt-get install --assume-yes --no-install-recommends \ - gcc \ - meson \ - ninja-build \ + bison \ default-libmysqlclient-dev \ + flex \ + gcc \ libacl1-dev \ libavahi-client-dev \ libcrack2-dev \ @@ -85,6 +87,8 @@ jobs: libtalloc-dev \ libtracker-sparql-3.0-dev \ libwrap0-dev \ + meson \ + ninja-build \ systemtap-sdt-dev \ tcpd \ tracker @@ -109,10 +113,10 @@ jobs: run: | apt-get update apt-get install --assume-yes --no-install-recommends \ - gcc \ - meson \ - ninja-build \ + bison \ default-libmysqlclient-dev \ + flex \ + gcc \ libacl1-dev \ libavahi-client-dev \ libcrack2-dev \ @@ -130,6 +134,8 @@ jobs: libtalloc-dev \ libtracker-sparql-3.0-dev \ libwrap0-dev \ + meson \ + ninja-build \ systemtap-sdt-dev \ tcpd \ tracker @@ -153,12 +159,12 @@ jobs: - name: Install dependencies run: | dnf -y install \ - meson \ - ninja-build \ avahi-devel \ + bison \ cracklib-devel \ dbus-devel \ dbus-glib-devel \ + flex \ gcc \ glib2-devel \ krb5-devel \ @@ -166,6 +172,8 @@ jobs: libdb-devel \ libgcrypt-devel \ libtalloc-devel \ + meson \ + ninja-build \ openldap-devel \ openssl-devel \ pam-devel \ @@ -191,7 +199,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install dependencies - run: brew install automake libressl mysql talloc krb5 berkeley-db meson + run: brew install bison flex libressl meson mysql talloc krb5 berkeley-db - name: Configure run: | meson setup build \ diff --git a/meson.build b/meson.build index e06ca57a779..52ce14688b1 100644 --- a/meson.build +++ b/meson.build @@ -146,7 +146,6 @@ flex = find_program('flex', required: true) grep = find_program('grep', required: true) mysql_config = find_program('mysql_config', required: false) perl = find_program('perl', required: true) -yacc = find_program('yacc', required: true) # # Check whether to check for 64_bit libraries