openssh: remove XBPS_GCC_* usage

This commit is contained in:
maxice8 2018-12-31 14:01:44 -02:00 committed by maxice8
parent 6c282fcaa6
commit 9dc63460c6
1 changed files with 5 additions and 7 deletions

View File

@ -19,9 +19,9 @@ makedepends="libedit-devel pam-devel zlib-devel
$(vopt_if ssl 'libressl-devel')" $(vopt_if ssl 'libressl-devel')"
short_desc="The OpenSSH implementation of SSH protocol" short_desc="The OpenSSH implementation of SSH protocol"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://www.openssh.com"
license="BSD-2-Clause, ISC" license="BSD-2-Clause, ISC"
distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz" homepage="https://www.openssh.com"
distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
checksum=6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad checksum=6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad
conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd" conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
make_dirs="/var/chroot/ssh 0755 root root" make_dirs="/var/chroot/ssh 0755 root root"
@ -30,9 +30,11 @@ make_dirs="/var/chroot/ssh 0755 root root"
build_options="ldns ssl gssapi" build_options="ldns ssl gssapi"
build_options_default="ldns ssl" build_options_default="ldns ssl"
CFLAGS+=" -Wno-format-truncation -Wno-stringop-truncation"
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
i686-musl) i686-musl)
CFLAGS="-fno-stack-protector" CFLAGS+=" -fno-stack-protector"
configure_args+=" --disable-wtmp --disable-utmp" configure_args+=" --disable-wtmp --disable-utmp"
;; ;;
*-musl) *-musl)
@ -40,10 +42,6 @@ case $XBPS_TARGET_MACHINE in
;; ;;
esac esac
if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then
CFLAGS+=" -Wno-format-truncation -Wno-stringop-truncation"
fi
pre_configure() { pre_configure() {
autoreconf -fi autoreconf -fi
} }