[gnome-build-meta/lle-bout/ppc64le: 18/20] Solve ppc64le/powerpc64le inconsistent mess

[Abderrahim Kitouni <akitouni src gnome org>]

commit c5f3c8cdb7e44c5b5c4096d322e96b93e912ba19
Author: Leo Le Bouter <lle-bout zaclys net>
Date:   Wed Jul 8 11:26:47 2020 +0200

    Solve ppc64le/powerpc64le inconsistent mess

 .gitlab-ci.yml | 12 ++++++------
 project.conf   | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef36d5d3..4917ed4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -191,20 +191,20 @@ default:
   variables:
     ARCH: arm
 
-.powerpc64le: &powerpc64le
+.ppc64le: &ppc64le
   image: "${DOCKER_PPC64LE}"
   tags:
   - ppc64le
   - gnome-build-meta
   variables:
-    ARCH: powerpc64le
+    ARCH: ppc64le
 
 #
 # "Real" CI jobs
 #
 
 track:
-  <<: *powerpc64le
+  <<: *ppc64le
   stage: track
   interruptible: true
   script:
@@ -236,9 +236,9 @@ build-gnome-core-arm:
   extends: .build-template
   <<: *arm
 
-build-gnome-core-powerpc64le:
+build-gnome-core-ppc64le:
   extends: .build-template
-  <<: *powerpc64le
+  <<: *ppc64le
 
 
 vm-image-x86_64:
@@ -341,7 +341,7 @@ flatpak-arm:
 
 flatpak-ppc64le:
   extends: .flatpak-template
-  <<: *powerpc64le
+  <<: *ppc64le
 
 flatpak-finish:
   stage: finish_flatpak
diff --git a/project.conf b/project.conf
index 4f07a1f3..8c6b4168 100644
--- a/project.conf
+++ b/project.conf
@@ -31,7 +31,7 @@ options:
     - aarch64
     - i686
     - x86_64
-    - powerpc64le
+    - ppc64le
 
 
 # Source aliases.
@@ -95,9 +95,9 @@ environment:
       CFLAGS: "%{flags_aarch64}"
       CXXFLAGS: "%{flags_aarch64}"
       LDFLAGS: "%{ldflags_defaults}"
-  - arch == "powerpc64le":
-      CFLAGS: "%{flags_powerpc64le}"
-      CXXFLAGS: "%{flags_powerpc64le}"
+  - arch == "ppc64le":
+      CFLAGS: "%{flags_ppc64le}"
+      CXXFLAGS: "%{flags_ppc64le}"
       LDFLAGS: "%{ldflags_defaults}"
 
 # Some overrides to element configuration based on type
@@ -228,7 +228,7 @@ variables:
   flags_i686: "-march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign %{common_flags} 
-fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection %{local_flags}"
   flags_aarch64: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection %{local_flags}"
   flags_arm: "%{common_flags} %{local_flags}"
-  flags_powerpc64le: "%{common_flags} %{local_flags}"
+  flags_ppc64le: "%{common_flags} %{local_flags}"
   ldflags_defaults: "-Wl,-z,relro,-z,now -Wl,--as-needed -L%{libdir}"
   local_flags: ''