From f98e59c618ebbcbed43585e02d999c332a8d4ff2 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Mon, 20 Apr 2026 10:24:43 +0200
Subject: [PATCH] main/gcc{4,6}: fix license and options fields

license= is not touched by pmbootstrap's gcc aportgen, so we need to
fix it manually.

options= is edited to match the modern output of aportgen.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8214>
---
 main/gcc4/APKBUILD | 6 +++---
 main/gcc6/APKBUILD | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/gcc4/APKBUILD b/main/gcc4/APKBUILD
index ff8132128..176750848 100644
--- a/main/gcc4/APKBUILD
+++ b/main/gcc4/APKBUILD
@@ -2,19 +2,19 @@ maintainer=""
 pkgname=gcc4
 pkgver=9999
 _pkgver=4.9.4
-pkgrel=9
+pkgrel=10
 pkgdesc="Old GCC for old vendor kernels (C compiler only)"
 url="http://gcc.gnu.org"
 # loongarch64: not supported
 # ppc64le, riscv64: doesn't build
 arch="all !loongarch64 !ppc64le !riscv64"
-license="GPL LGPL"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$_pkgver-r$pkgrel
 depends="binutils mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev"
 subpackages=" "
-options=""
+options="!strip !tracedeps toolchain"
 
 # We only care about C, so we can compile old Linux kernels
 LANG_CXX=false
diff --git a/main/gcc6/APKBUILD b/main/gcc6/APKBUILD
index e4303689d..ccd8fb6e1 100644
--- a/main/gcc6/APKBUILD
+++ b/main/gcc6/APKBUILD
@@ -2,20 +2,20 @@ maintainer=""
 pkgname=gcc6
 pkgver=9999
 _pkgver=6.4.0
-pkgrel=14
+pkgrel=15
 pkgdesc="Old GCC for old vendor kernels (C compiler only)"
 url="http://gcc.gnu.org"
 # loongarch64: not relevant
 # ppc64le: not relevant
 # riscv64: doesn't build
 arch="all !loongarch64 !ppc64le !riscv64"
-license="GPL LGPL"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$_pkgver-r$pkgrel
 depends="binutils mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev"
 subpackages=" "
-options=""
+options="!strip !tracedeps toolchain"
 
 # We only care about C, so we can compile old Linux kernels
 LANG_CXX=false