From 54a165e911f5c3771143eafeea6cf6476116923d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 10 May 2015 09:47:55 +0200 Subject: [PATCH] samba: disable quotas to make this build with musl for now. --- srcpkgs/samba/template | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 203a0dbc9ba..88576d09e9f 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba version=3.6.25 -revision=4 +revision=5 build_pie=yes build_wrksrc=source3 build_style=gnu-configure @@ -25,12 +25,14 @@ build_options="systemd" conf_files="/etc/pam.d/samba" make_dirs="/etc/samba/private 0750 root root" hostmakedepends="pkg-config perl python-devel" -makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel - mit-krb5-devel libldap-devel pam-devel acl-devel avahi-libs-devel - tdb-devel talloc-devel cups-devel" +makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel mit-krb5-devel + libldap-devel pam-devel acl-devel avahi-libs-devel tdb-devel talloc-devel cups-devel" -if [ "$CROSS_BUILD" ]; then - configure_args+=" samba_cv_CC_NEGATIVE_ENUM_VALUES=yes +do_configure() { + sed -e 's,XFS_QUOTA_,FS_QUOTA_,g' -i lib/sysquotas_xfs.c + + if [ "$CROSS_BUILD" ]; then + configure_args+=" samba_cv_CC_NEGATIVE_ENUM_VALUES=yes libreplace_cv_HAVE_GETADDRINFO=no libreplace_cv_HAVE_GETIFADDRS=yes ac_cv_file__proc_sys_kernel_core_pattern=yes @@ -38,10 +40,9 @@ if [ "$CROSS_BUILD" ]; then samba_cv_HAVE_WRFILE_KEYTAB=yes smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes" -fi - -pre_configure() { - sed -e 's,XFS_QUOTA_,FS_QUOTA_,g' -i lib/sysquotas_xfs.c + fi + # Disable quotas, broken with musl (needs rpc). + ./configure ${configure_args} --without-quotas } post_install() { cd ${wrksrc}