diff options
author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2020-07-17 16:29:01 +0200 |
---|---|---|
committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2020-07-17 16:29:01 +0200 |
commit | 13f35bbe7b1ee8e567b967d4c8cac7f7e5e96bde (patch) | |
tree | f993df12d4f6a8e2006426394d018339835a8573 | |
parent | ff07991f41f89a21355b6e1c77a4db4393321d47 (diff) |
Do not specify architectures for build packages, this is not necessary.
-rw-r--r-- | snapcraft.yaml | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/snapcraft.yaml b/snapcraft.yaml index 68095f2..e715627 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -498,12 +498,11 @@ parts: plugin: meson meson-parameters: ["--prefix=/usr", "-Dbuildtype=release"] build-packages: - - on amd64,i386: - - gcc - - libdrm-dev - - libwayland-bin - - libwayland-dev - - pkg-config + - gcc + - libdrm-dev + - libwayland-bin + - libwayland-dev + - pkg-config override-build: | if [ $(arch) = "x86_64" -o $(arch) = "i686" ]; then snapcraftctl build @@ -521,9 +520,8 @@ parts: plugin: cmake configflags: [ "-DCMAKE_INSTALL_PREFIX=/usr" ] build-packages: - - on amd64,i386: - - g++ - - sed + - g++ + - sed override-build: | if [ $(arch) = "x86_64" -o $(arch) = "i686" ]; then snapcraftctl build @@ -546,9 +544,8 @@ parts: plugin: cmake configflags: [ "-DCMAKE_INSTALL_PREFIX=/usr" ] build-packages: - - on amd64,i386: - - g++ - - libpciaccess-dev + - g++ + - libpciaccess-dev override-build: | if [ $(arch) = "x86_64" -o $(arch) = "i686" ]; then snapcraftctl build |