From 666b9b7df437fd9d95f32c5c6701d8af53df7600 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 1 Feb 2025 11:15:38 -0500
Subject: [PATCH] GitLibCI: installing g++ also installs gcc, one less manually
install package
---
.gitlab/ci/jobs/alpine-3-gcc-dedicated-makefile.yml | 2 +-
.gitlab/ci/jobs/alpine-3-gcc-makefile.yml | 2 +-
.gitlab/ci/jobs/alpine-3-gcc.yml | 2 +-
.gitlab/ci/jobs/batocera-arm64-makefile.yml | 2 +-
.gitlab/ci/jobs/batocera-arm64.yml | 2 +-
.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-oldstable-amd64.yml | 2 +-
.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-oldstable-arm64.yml | 2 +-
.gitlab/ci/jobs/debian-stable-amd64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-stable-amd64.yml | 2 +-
.gitlab/ci/jobs/debian-stable-arm64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-stable-arm64.yml | 2 +-
.gitlab/ci/jobs/debian-stable-i386-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-stable-i386.yml | 2 +-
.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-testing-gcc-amd64.yml | 2 +-
.gitlab/ci/jobs/windows-x64-makefile.yml | 2 +-
.gitlab/ci/jobs/windows-x64.yml | 2 +-
.gitlab/ci/jobs/windows-x86-makefile.yml | 2 +-
.gitlab/ci/jobs/windows-x86.yml | 2 +-
21 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/.gitlab/ci/jobs/alpine-3-gcc-dedicated-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-dedicated-makefile.yml
index fe63e09c83..5d875d8657 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc-dedicated-makefile.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc-dedicated-makefile.yml
@@ -12,7 +12,7 @@ Alpine 3 GCC Dedicated Makefile:
- - |
# apk_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apk_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apk add gcc g++
+ - apk add g++
- |
# apk_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apk_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 2cc656ca78..6b0b6a06f5 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
@@ -95,7 +95,7 @@ Alpine 3 GCC Makefile:
- - |
# apk_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apk_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apk add gcc g++
+ - apk add g++
- |
# apk_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apk_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 1881bf3c2a..522b88ae34 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc.yml
@@ -95,7 +95,7 @@ Alpine 3 GCC:
- - |
# apk_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apk_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apk add gcc g++
+ - apk add g++
- |
# apk_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apk_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/batocera-arm64-makefile.yml b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
index c38f46b7dc..e02497d40d 100644
--- a/.gitlab/ci/jobs/batocera-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
@@ -16,7 +16,7 @@ batocera:arm64 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-aarch64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/batocera-arm64.yml b/.gitlab/ci/jobs/batocera-arm64.yml
index bae3afa447..c3b5865842 100644
--- a/.gitlab/ci/jobs/batocera-arm64.yml
+++ b/.gitlab/ci/jobs/batocera-arm64.yml
@@ -16,7 +16,7 @@ batocera:arm64:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-aarch64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
index cdd67c1c1c..bd4a927419 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
@@ -18,7 +18,7 @@ Debian oldstable:amd64 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-x86-64-linux-gnu g++-x86-64-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-x86-64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64.yml b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
index 8a9669228d..ad69dc8dd3 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
@@ -18,7 +18,7 @@ Debian oldstable:amd64:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-x86-64-linux-gnu g++-x86-64-linux-gnu || apt-get install gcc g++
+ - apt-get install ++-x86-64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
index f33f91da6d..426934bf97 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
@@ -18,7 +18,7 @@ Debian oldstable:arm64 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu || apt-get install g++
+ - apt-get install g++-aarch64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64.yml b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
index 579de0f37c..24db9c8078 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
@@ -18,7 +18,7 @@ Debian oldstable:arm64:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-aarch64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
index f68d796e6d..a6aebfac34 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
@@ -24,7 +24,7 @@ Debian stable:amd64 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-x86-64-linux-gnu g++-x86-64-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-x86-64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-amd64.yml b/.gitlab/ci/jobs/debian-stable-amd64.yml
index a14832d134..a39344db89 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64.yml
@@ -24,7 +24,7 @@ Debian stable:amd64:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-x86-64-linux-gnu g++-x86-64-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-x86-64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
index b4aadb6d9d..53625138ab 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
@@ -25,7 +25,7 @@ Debian stable:arm64 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu || apt-get install gcc g++
+ - apt-get install gg++-aarch64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-arm64.yml b/.gitlab/ci/jobs/debian-stable-arm64.yml
index fd3d86c1cd..52e6e8603a 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64.yml
@@ -25,7 +25,7 @@ Debian stable:arm64:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-aarch64-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
index 5c7f11c5bf..dd572ec383 100644
--- a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
@@ -24,7 +24,7 @@ Debian stable:i386 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-i686-linux-gnu g++-i686-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-i686-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-i386.yml b/.gitlab/ci/jobs/debian-stable-i386.yml
index 282f3a04e2..ad4dcbb4ff 100644
--- a/.gitlab/ci/jobs/debian-stable-i386.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386.yml
@@ -24,7 +24,7 @@ Debian stable:i386:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-i686-linux-gnu g++-i686-linux-gnu || apt-get install gcc g++
+ - apt-get install g++-i686-linux-gnu || apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
index 30970b49f6..70d71b5377 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
@@ -25,7 +25,7 @@ Debian testing GCC Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc g++
+ - apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
index 66ce5152f0..7efb6c62df 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
@@ -25,7 +25,7 @@ Debian testing GCC:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc g++
+ - apt-get install g++
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/windows-x64-makefile.yml b/.gitlab/ci/jobs/windows-x64-makefile.yml
index 23d7177ef1..8da30d2b98 100644
--- a/.gitlab/ci/jobs/windows-x64-makefile.yml
+++ b/.gitlab/ci/jobs/windows-x64-makefile.yml
@@ -21,7 +21,7 @@ Windows x64 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-mingw-w64-x86-64-win32 g++-mingw-w64-x86-64-win32
+ - apt-get install g++-mingw-w64-x86-64-win32
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml
index 1c8f9c09c7..e5accf926b 100644
--- a/.gitlab/ci/jobs/windows-x64.yml
+++ b/.gitlab/ci/jobs/windows-x64.yml
@@ -21,7 +21,7 @@ Windows x64:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-mingw-w64-x86-64-win32 g++-mingw-w64-x86-64-win32
+ - apt-get install g++-mingw-w64-x86-64-win32
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/windows-x86-makefile.yml b/.gitlab/ci/jobs/windows-x86-makefile.yml
index 9601cd6e68..213342cda8 100644
--- a/.gitlab/ci/jobs/windows-x86-makefile.yml
+++ b/.gitlab/ci/jobs/windows-x86-makefile.yml
@@ -21,7 +21,7 @@ Windows x86 Makefile:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-mingw-w64-i686-win32
+ - apt-get install g++-mingw-w64-i686-win32
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml
index 5c0b8d6bc2..f983c82875 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -68,7 +68,7 @@ Windows x86:
- - |
# apt_toolchain
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install gcc-mingw-w64-i686-win32 g++-mingw-w64-i686-win32
+ - apt-get install g++-mingw-w64-i686-win32
- |
# apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
--
GitLab