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:
parent
c730326d3c
commit
4786516a22
|
@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel
|
||||||
depends="isl binutils-aarch64"
|
depends="isl binutils-aarch64"
|
||||||
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
|
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"
|
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"
|
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
|
||||||
replaces="libstdc++ binutils"
|
replaces="libstdc++ binutils"
|
||||||
|
|
||||||
|
@ -129,7 +129,6 @@ fi
|
||||||
|
|
||||||
_languages=c
|
_languages=c
|
||||||
if $LANG_CXX; then
|
if $LANG_CXX; then
|
||||||
subpackages="$subpackages g++$_target:gpp"
|
|
||||||
_languages="$_languages,c++"
|
_languages="$_languages,c++"
|
||||||
fi
|
fi
|
||||||
if $LANG_OBJC; then
|
if $LANG_OBJC; then
|
||||||
|
|
|
@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel
|
||||||
depends="isl binutils-armhf"
|
depends="isl binutils-armhf"
|
||||||
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
|
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"
|
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"
|
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
|
||||||
replaces="libstdc++ binutils"
|
replaces="libstdc++ binutils"
|
||||||
|
|
||||||
|
@ -129,7 +129,6 @@ fi
|
||||||
|
|
||||||
_languages=c
|
_languages=c
|
||||||
if $LANG_CXX; then
|
if $LANG_CXX; then
|
||||||
subpackages="$subpackages g++$_target:gpp"
|
|
||||||
_languages="$_languages,c++"
|
_languages="$_languages,c++"
|
||||||
fi
|
fi
|
||||||
if $LANG_OBJC; then
|
if $LANG_OBJC; then
|
||||||
|
|
|
@ -34,7 +34,7 @@ def generate(args, pkgname):
|
||||||
"depends": "isl binutils-" + arch,
|
"depends": "isl binutils-" + arch,
|
||||||
"makedepends_build": "gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev",
|
"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,
|
"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",
|
"LIBGOMP": "false",
|
||||||
"LIBGCC": "false",
|
"LIBGCC": "false",
|
||||||
|
@ -54,9 +54,10 @@ def generate(args, pkgname):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
replace_simple = {
|
replace_simple = {
|
||||||
# Do not package libstdc++
|
# Do not package libstdc++, do not add "g++-$ARCH" here (already
|
||||||
'*subpackages="$subpackages libstdc++:libcxx:*':
|
# did that explicitly in the subpackages variable above, so
|
||||||
' subpackages="$subpackages g++$_target:gpp"',
|
# pmbootstrap picks it up properly).
|
||||||
|
'*subpackages="$subpackages libstdc++:libcxx:*': None
|
||||||
}
|
}
|
||||||
|
|
||||||
pmb.aportgen.core.rewrite(
|
pmb.aportgen.core.rewrite(
|
||||||
|
|
Loading…
Reference in New Issue