From b015b288b88a3c04fec4a2bc8022a973c7f926ee Mon Sep 17 00:00:00 2001 From: Daniele Debernardi Date: Tue, 12 Feb 2019 20:57:05 +0000 Subject: [PATCH] Add gcc4 cross-compiler support (!1754) [skip ci]: CI already went through successfully, just rebasing. --- pmb/aportgen/gcc.py | 5 ++++- pmb/build/_package.py | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py index f6da59b4..e07e0260 100644 --- a/pmb/aportgen/gcc.py +++ b/pmb/aportgen/gcc.py @@ -28,11 +28,14 @@ def generate(args, pkgname): if prefix == "gcc": upstream = pmb.aportgen.core.get_upstream_aport(args, "main/gcc") based_on = "main/gcc (from Alpine)" + elif prefix == "gcc4": + upstream = args.aports + "/main/gcc4" + based_on = "main/gcc4 (from postmarketOS)" elif prefix == "gcc6": upstream = args.aports + "/main/gcc6" based_on = "main/gcc6 (from postmarketOS)" else: - raise ValueError("Invalid prefix '" + prefix + "', expected gcc or" + raise ValueError("Invalid prefix '" + prefix + "', expected gcc, gcc4 or" " gcc6.") pmb.helpers.run.user(args, ["cp", "-r", upstream, args.work + "/aportgen"]) diff --git a/pmb/build/_package.py b/pmb/build/_package.py index 8b0e23e4..48ebfcee 100644 --- a/pmb/build/_package.py +++ b/pmb/build/_package.py @@ -200,7 +200,9 @@ def init_buildenv(args, apkbuild, arch, strict=False, force=False, cross=None, # Cross-compiler init if cross: cross_pkgs = ["ccache-cross-symlinks"] - if "gcc6" in depends: + if "gcc4" in depends: + cross_pkgs += ["gcc4-" + arch] + elif "gcc6" in depends: cross_pkgs += ["gcc6-" + arch] else: cross_pkgs += ["gcc-" + arch, "g++-" + arch]