Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rsync: drop option for included zlib

Browse source 
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2020-07-26 00:01:27 -07:00
parent 5164697861
commit 100f43e60e
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/rsync/Config.in
View file

@ -12,16 +12,4 @@ if PACKAGE_rsync
default y if USE_FS_ACL_ATTR default y if USE_FS_ACL_ATTR
default n default n
config RSYNC_zlib
bool
prompt "Enable system zlib"
help
Use the system's zlib library instead of rsync's internal copy. Enabling
this may create compatibility errors when using compression with older
clients, or those using the current default of the bundled zlib.
rsync's upstream default is to use their bundled zlib. OpenWrt uses the
system zlib for space reasons. The system zlib will eventually become
default for upstream as well.
default y
endif endif

4
net/rsync/Makefile
View file

@ -30,7 +30,7 @@ define Package/rsync
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=File Transfer SUBMENU:=File Transfer
TITLE:=Fast remote file copy program (like rcp) TITLE:=Fast remote file copy program (like rcp)
DEPENDS:=+libpopt +RSYNC_xattr:libattr +RSYNC_acl:libacl +RSYNC_zlib:zlib DEPENDS:=+libpopt +zlib +RSYNC_xattr:libattr +RSYNC_acl:libacl
URL:=https://rsync.samba.org/ URL:=https://rsync.samba.org/
MENU:=1 MENU:=1
endef endef
@ -43,6 +43,7 @@ TARGET_CFLAGS += $(if $(CONFIG_IPV6),-DINET6,)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--without-included-popt \ --without-included-popt \
--without-included-zlib \
--disable-debug \ --disable-debug \
--disable-asm \ --disable-asm \
--disable-iconv \ --disable-iconv \
@ -56,7 +57,6 @@ CONFIGURE_ARGS += \
--disable-zstd \ --disable-zstd \
--$(if $(CONFIG_RSYNC_xattr),en,dis)able-xattr-support \ --$(if $(CONFIG_RSYNC_xattr),en,dis)able-xattr-support \
--$(if $(CONFIG_RSYNC_acl),en,dis)able-acl-support \ --$(if $(CONFIG_RSYNC_acl),en,dis)able-acl-support \
--with$(if $(CONFIG_RSYNC_zlib),,out)-included-zlib \
$(if $(CONFIG_IPV6),,--disable-ipv6) $(if $(CONFIG_IPV6),,--disable-ipv6)
define Package/rsyncd define Package/rsyncd