synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support cross compiling kernels with GCC6 

* aportgen: modify code to allow generating gcc6-armhf and other gcc6
  cross compiler packages
* package: when 'gcc6' is in the depends of a package, and the cross
  compiling mode is "native" (as we do it with kernels), install the
  gcc6 cross compiler instead of the usual one (gcc8)

Related: pmaports#103
This commit is contained in:
Oliver Smith 2018-09-30 03:53:29 +02:00
parent f68a7a6baa
commit 3e7c95e8b4
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pmb/aportgen/gcc.py
View File

@ -23,8 +23,17 @@ import pmb.helpers.run
def generate(args, pkgname):
# Copy original aport
prefix = pkgname.split("-")[0]
arch = pkgname.split("-")[1]
upstream = pmb.aportgen.core.get_upstream_aport(args, "main/gcc")
if prefix == "gcc":
upstream = pmb.aportgen.core.get_upstream_aport(args, "main/gcc")
based_on = "main/gcc (from Alpine)"
elif prefix == "gcc6":
upstream = args.aports + "/main/gcc6"
based_on = "main/gcc6 (from postmarketOS)"
else:
raise ValueError("Invalid prefix '" + prefix + "', expected gcc or"
" gcc6.")
pmb.helpers.run.user(args, ["cp", "-r", upstream, args.work + "/aportgen"])
# Architectures to build this package for
@ -39,7 +48,11 @@ def generate(args, pkgname):
"depends": "isl binutils-" + arch,
"makedepends_build": "gcc g++ paxmark 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 musl-dev-" + arch + " binutils-" + arch,
"subpackages": "g++-" + arch + ":gpp",
"subpackages": "g++-" + arch + ":gpp" if prefix == "gcc" else "",
# gcc6: options is already there, so we need to replace it and not only
# set it below the header like done below.
"options": "!strip !tracedeps",
"LIBGOMP": "false",
"LIBGCC": "false",
@ -80,6 +93,6 @@ def generate(args, pkgname):
'*_cross_configure=*': None,
}
pmb.aportgen.core.rewrite(args, pkgname, "main/gcc", fields,
pmb.aportgen.core.rewrite(args, pkgname, based_on, fields,
replace_simple=replace_simple,
below_header=below_header)

8
pmb/build/_package.py
View File

@ -190,8 +190,12 @@ def init_buildenv(args, apkbuild, arch, strict=False, force=False, cross=None,
# Cross-compiler init
if cross:
pmb.chroot.apk.install(args, ["gcc-" + arch, "g++-" + arch,
"ccache-cross-symlinks"])
cross_pkgs = ["ccache-cross-symlinks"]
if "gcc6" in depends:
cross_pkgs += ["gcc6-" + arch]
else:
cross_pkgs += ["gcc-" + arch, "g++-" + arch]
pmb.chroot.apk.install(args, cross_pkgs)
if cross == "distcc":
pmb.chroot.distccd.start(args, arch)