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

Fix #219 for real! 

100% tested. Assuming that you don't need to test an obvious change,
because it only changes one line is dangerous. I will learn from this,
sorry for the inconvenience.

`gcc-armhf` compiles fine again with that change, and it is able to
cross-compile packages as it used to.
This commit is contained in:
Oliver Smith 2017-07-22 12:36:00 +02:00
parent c730326d3c
commit 4786516a22
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aports/gcc-aarch64/APKBUILD
View File

@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel
depends="isl binutils-aarch64"
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-aarch64 binutils-aarch64"
subpackages="g++-aarch64"
subpackages="g++-aarch64:gpp"
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
replaces="libstdc++ binutils"
@ -129,7 +129,6 @@ fi
_languages=c
if $LANG_CXX; then
subpackages="$subpackages g++$_target:gpp"
_languages="$_languages,c++"
fi
if $LANG_OBJC; then

3
aports/gcc-armhf/APKBUILD
View File

@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel
depends="isl binutils-armhf"
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-armhf binutils-armhf"
subpackages="g++-armhf"
subpackages="g++-armhf:gpp"
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
replaces="libstdc++ binutils"
@ -129,7 +129,6 @@ fi
_languages=c
if $LANG_CXX; then
subpackages="$subpackages g++$_target:gpp"
_languages="$_languages,c++"
fi
if $LANG_OBJC; then

9
pmb/aportgen/gcc.py
View File

@ -34,7 +34,7 @@ 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,
"subpackages": "g++-" + arch + ":gpp",
"LIBGOMP": "false",
"LIBGCC": "false",
@ -54,9 +54,10 @@ def generate(args, pkgname):
"""
replace_simple = {
# Do not package libstdc++
'*subpackages="$subpackages libstdc++:libcxx:*':
' subpackages="$subpackages g++$_target:gpp"',
# Do not package libstdc++, do not add "g++-$ARCH" here (already
# did that explicitly in the subpackages variable above, so
# pmbootstrap picks it up properly).
'*subpackages="$subpackages libstdc++:libcxx:*': None
}
pmb.aportgen.core.rewrite(