diff options
Diffstat (limited to 'package/samba/samba.mk')
| -rw-r--r-- | package/samba/samba.mk | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 120369376..d7a15b3f2 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -4,21 +4,19 @@ # ############################################################# -SAMBA_VERSION = 3.5.15 +SAMBA_VERSION = 3.6.5 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable SAMBA_SUBDIR = source3 SAMBA_INSTALL_STAGING = YES - -SAMBA_DEPENDENCIES = \ - $(if $(BR2_ENABLE_LOCALE),,libiconv) \ +SAMBA_DEPENDENCIES = popt \ $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline) \ $(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),readline) \ $(if $(BR2_PACKAGE_SAMBA_AVAHI),avahi) \ $(if $(BR2_PACKAGE_SAMBA_GAMIN),gamin) - SAMBA_CONF_ENV = \ + ac_cv_file__proc_sys_kernel_core_pattern=yes \ samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \ samba_cv_USE_SETREUID=yes \ samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \ @@ -31,7 +29,6 @@ SAMBA_CONF_ENV = \ libreplace_cv_HAVE_IPV6=$(if $(BR2_INET_IPV6),yes,no) \ $(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread) - SAMBA_CONF_OPT = \ --localstatedir=/var \ --with-piddir=/var/run \ @@ -51,49 +48,38 @@ SAMBA_CONF_OPT = \ $(if $(BR2_PACKAGE_SAMBA_SWAT),--enable-swat,--disable-swat) \ \ --without-cluster-support \ - --without-cifsupcall \ + --without-dnsupdate \ + $(if $(BR2_INET_RPC),--with-sys-quotas,--without-sys-quotas) \ --without-ads \ --without-ldap \ - --with-included-popt \ --with-included-iniparser \ - --with-libiconv=$(STAGING_DIR) \ \ - $(if $(BR2_PACKAGE_SAMBA_CIFS),--with-cifsmount,--without-cifsmount) \ $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),--with-readline=$(STAGING_DIR)) \ $(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \ $(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind) - SAMBA_INSTALL_TARGET_OPT = \ DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \ installlibs installservers installbin installscripts \ - $(if $(BR2_PACKAGE_SAMBA_CIFS),installcifsmount) \ $(if $(BR2_PACKAGE_SAMBA_SWAT),installswat) - SAMBA_UNINSTALL_TARGET_OPT = \ DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \ uninstalllibs uninstallservers uninstallbin uninstallscripts \ - $(if $(BR2_PACKAGE_SAMBA_CIFS),uninstallcifsmount) \ $(if $(BR2_PACKAGE_SAMBA_SWAT),uninstallswat) - # binaries to keep SAMBA_BINTARGETS_y = \ usr/sbin/smbd \ usr/lib/libtalloc.so \ usr/lib/libtdb.so - # binaries to remove SAMBA_BINTARGETS_ = \ usr/lib/libnetapi.so* \ usr/lib/libsmbsharemodes.so* - # binaries to keep or remove -SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs -SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/umount.cifs SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd @@ -131,7 +117,6 @@ SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD) += usr/lib/libwbclient.so* SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_LIBSMBCLIENT) += usr/lib/libsmbclient.so* - # non-binaries to remove SAMBA_TXTTARGETS_ = \ usr/include/libsmbclient.h \ @@ -141,7 +126,6 @@ SAMBA_TXTTARGETS_ = \ usr/include/tdb.h \ usr/include/wbclient.h - # non-binaries to keep or remove SAMBA_TXTTARGETS_$(BR2_PACKAGE_SAMBA_FINDSMB) += usr/bin/findsmb SAMBA_TXTTARGETS_$(BR2_PACKAGE_SAMBA_SMBTAR) += usr/bin/smbtar @@ -163,6 +147,14 @@ define SAMBA_REMOVE_SWAT_DOCUMENTATION rm -rf $(TARGET_DIR)/usr/swat/help/welcome.html endef +# --with-libiconv="" is to avoid detecting host libiconv and build failure +ifeq ($(BR2_PACKAGE_SAMBA_LIBICONV),y) +SAMBA_DEPENDENCIES += libiconv +SAMBA_CONF_OPT += --with-libiconv=$(STAGING_DIR) +else +SAMBA_CONF_OPT += --with-libiconv="" +endif + ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) ifneq ($(BR2_HAVE_DOCUMENTATION),y) SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION |