mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
gcc: fix typo
Closes: #4259 Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
parent
1051f03b4e
commit
7e6b9bf82c
1 changed files with 26 additions and 20 deletions
|
@ -43,24 +43,27 @@ checkdepends="dejagnu"
|
||||||
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
|
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
|
||||||
subpackages+=" libssp libssp-devel"
|
subpackages+=" libssp libssp-devel"
|
||||||
|
|
||||||
build_options="gnatboot"
|
build_options="ada gnatboot"
|
||||||
desc_option_gnatboot="Bootstrap Ada using adacore.com binaries"
|
build_options_default="ada"
|
||||||
|
desc_option_ada="Enable Ada build"
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
desc_option_gnatboot="Enable Ada bootstrap using adacore.com binaries"
|
||||||
x86_64)
|
|
||||||
_gnat_tarball="gnat-gpl-2017-x86_64-linux-bin.tar.gz"
|
|
||||||
distfiles+=" http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7>$_gnat_tarball"
|
|
||||||
checksum+=" b942bcac20dea39748b39f8b624d9619f60a8dee2e8195dbe3829c835b0956e6"
|
|
||||||
build_options_default="gnatboot"
|
|
||||||
;;
|
|
||||||
i686)
|
|
||||||
_gnat_tarball="gnat-gpl-2014-x86-linux-bin.tar.gz"
|
|
||||||
distfiles+=" http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248>$_gnat_tarball"
|
|
||||||
checksum+=" 3b693510f5d22a240abb3034934c1adbd80ccd6e4f61a4f491cc408fdfd9c042"
|
|
||||||
build_options_default="gnatboot"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
if [ "$build_option_gnatboot" ]; then
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
x86_64)
|
||||||
|
_gnat_tarball="gnat-gpl-2017-x86_64-linux-bin.tar.gz"
|
||||||
|
distfiles+=" http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7>$_gnat_tarball"
|
||||||
|
checksum+=" b942bcac20dea39748b39f8b624d9619f60a8dee2e8195dbe3829c835b0956e6"
|
||||||
|
build_options_default="gnatboot"
|
||||||
|
;;
|
||||||
|
i686)
|
||||||
|
_gnat_tarball="gnat-gpl-2014-x86-linux-bin.tar.gz"
|
||||||
|
distfiles+=" http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248>$_gnat_tarball"
|
||||||
|
checksum+=" 3b693510f5d22a240abb3034934c1adbd80ccd6e4f61a4f491cc408fdfd9c042"
|
||||||
|
build_options_default="gnatboot"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
if [ -n "$CHROOT_READY" ]; then
|
if [ -n "$CHROOT_READY" ]; then
|
||||||
subpackages+=" gcc-fortran libgfortran-devel libgfortran"
|
subpackages+=" gcc-fortran libgfortran-devel libgfortran"
|
||||||
if [ -z "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
|
@ -75,10 +78,9 @@ if [ -n "$CHROOT_READY" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
subpackages+=" libstdc++-devel libstdc++ libgcc-devel"
|
subpackages+=" libstdc++-devel libstdc++ libgcc-devel"
|
||||||
if [ "$build_option_gnatboot" ]; then
|
if [ "$build_option_gnatboot" -o "$build_option_ada" ]; then
|
||||||
subpackages+=" gcc-ada libada-devel libada"
|
subpackages+=" gcc-ada libada-devel libada"
|
||||||
fi
|
fi
|
||||||
# TODO: figure whether the host's gcc is able to compile ada and enable the subpackages
|
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
i686) _triplet="i686-pc-linux-gnu";;
|
i686) _triplet="i686-pc-linux-gnu";;
|
||||||
|
@ -256,6 +258,10 @@ do_configure() {
|
||||||
GNATMAKE="${wrksrc}/gnat/bin/gnatmake" \
|
GNATMAKE="${wrksrc}/gnat/bin/gnatmake" \
|
||||||
PATH="${wrksrc}/gnat/bin:$PATH" \
|
PATH="${wrksrc}/gnat/bin:$PATH" \
|
||||||
${wrksrc}/configure ${_args}
|
${wrksrc}/configure ${_args}
|
||||||
|
elif [ "$build_option_ada" ]; then
|
||||||
|
_args+=" --enable-languages=${_langs},ada"
|
||||||
|
CONFIG_SHELL=/bin/bash \
|
||||||
|
${wrksrc}/configure ${_args}
|
||||||
else
|
else
|
||||||
_args+=" --enable-languages=${_langs}"
|
_args+=" --enable-languages=${_langs}"
|
||||||
CONFIG_SHELL=/bin/bash \
|
CONFIG_SHELL=/bin/bash \
|
||||||
|
@ -421,7 +427,7 @@ libada-devel_package() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
libada_package() {
|
libada_package() {
|
||||||
short_desc=" - Ada library"
|
short_desc+=" - Ada library"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/lib/gcc/${_triplet}/${_majorver}/adalib
|
vmove usr/lib/gcc/${_triplet}/${_majorver}/adalib
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue