From 6e35f5cd03c14f671175f535a1fd57bd16ea3bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:06 -0300 Subject: [PATCH] s6-networking: update to 2.3.2.0, remove noarch. Update for nsss headers location. --- srcpkgs/s6-networking/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 50ff6abbc1f..e53eca35a33 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,7 +1,7 @@ # Template file for 's6-networking' pkgname=s6-networking -version=2.3.1.2 -revision=3 +version=2.3.2.0 +revision=1 build_style=configure configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl) $(vopt_if bearssl --enable-ssl=bearssl) @@ -15,7 +15,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-networking" changelog="https://skarnet.org/software/s6-networking/upgrade.html" distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=d953dbfdf9020bb27e873328df1b644f8a7b6a3972a4288b1f20edeaf85b4980 +checksum=bbe36a8460d90f3bff56c934811876186f7224ced5bdc15c2c96d49b4e917d12 build_options="bearssl libressl" build_options_default="libressl" @@ -24,7 +24,10 @@ desc_option_libressl="Use LibreSSL as SSL library" vopt_conflict bearssl libressl case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;; + *-musl) + makedepends+=" nsss-devel" + configure_args+=" --enable-nsss --with-include=${XBPS_CROSS_BASE}/usr/include/nsss" + ;; esac post_install() { @@ -34,7 +37,6 @@ post_install() { } s6-networking-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() {