diff options
author | Timo Teräs <timo.teras@iki.fi> | 2011-02-04 21:28:58 +0200 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2011-02-04 21:28:58 +0200 |
commit | 820ca1e1df361daf29fdc8fbfe2450961b83f9c5 (patch) | |
tree | 8bcea1c8b81aaf296f3841bbe32043783b6f22b2 /main/samba | |
parent | 6d8e169e5a8dc6d7ca5857e8488255ab21b10a38 (diff) | |
download | aports-820ca1e1df361daf29fdc8fbfe2450961b83f9c5.tar.bz2 aports-820ca1e1df361daf29fdc8fbfe2450961b83f9c5.tar.xz |
main/talloc, samba: fix libtalloc conflict
* make samba use talloc provided libraries
* allow talloc to overwrite libtalloc from samba-common
Diffstat (limited to 'main/samba')
-rw-r--r-- | main/samba/APKBUILD | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index ae59f87fb..cea027533 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba pkgver=3.5.6 -pkgrel=2 +pkgrel=3 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" arch="all" @@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc winbind $pkgname-common $pkgname-initscript tdb libsmbclient $pkgname-client" depends="samba-initscript samba-client" makedepends="popt-dev ncurses-dev openldap-dev heimdal-dev e2fsprogs-dev - libiconv-dev" + libiconv-dev talloc-dev" source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz samba.initd samba.confd @@ -42,6 +42,7 @@ build() { --with-krb5 \ --with-libsmbclient \ --with-shared-modules=idmap_rid,imap_ad \ + --enable-external-libtalloc \ --disable-nss-wrapper \ --disable-dnssd \ --disable-swat |