summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Mingulov <denis@mingulov.com>2013-10-16 13:13:37 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-11-01 16:12:51 (GMT)
commit6eac08192d8dceaba992d11d8874ea3af93011b5 (patch)
treee9608dd6f2ffdae575207a1d74b871b02c88bf14
parentee1565bf36f42781dfc7d42df8bd1445b4202a2f (diff)
downloadbuildroot-6eac08192d8dceaba992d11d8874ea3af93011b5.tar.gz
buildroot-6eac08192d8dceaba992d11d8874ea3af93011b5.tar.bz2
rsync: use system zlib and popt, also do not lose debug options
rsync by default compiles statically its own zlib and popt libraries, it is better to use system wide libraries instead - both for disk and memory consumption. Change rsync package accordingly. Also previously a debug configure option has been lost, as overwritten by '--with-included-popt' option - fixed. For example, on ARMv5 rsync binary size is reduced by about 25%. Signed-off-by: Denis Mingulov <denis@mingulov.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/rsync/Config.in2
-rw-r--r--package/rsync/rsync.mk7
2 files changed, 7 insertions, 2 deletions
diff --git a/package/rsync/Config.in b/package/rsync/Config.in
index be95a7c..b952974 100644
--- a/package/rsync/Config.in
+++ b/package/rsync/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_RSYNC
bool "rsync"
# fork()
depends on BR2_USE_MMU
+ select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_POPT
help
File transfer program to keep remote files in sync.
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index d8e5f3f..35f128c 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -8,7 +8,10 @@ RSYNC_VERSION = 3.1.0
RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
RSYNC_LICENSE = GPLv3+
RSYNC_LICENSE_FILES = COPYING
-RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
-RSYNC_CONF_OPT = --with-included-popt
+RSYNC_DEPENDENCIES = zlib popt
+RSYNC_CONF_OPT = \
+ $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
+ --with-included-zlib=no \
+ --with-included-popt=no
$(eval $(autotools-package))