From patchwork Wed Oct 16 13:13:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Mingulov X-Patchwork-Id: 283941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id C462B2C0092 for ; Thu, 17 Oct 2013 00:16:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ABCA532C11; Wed, 16 Oct 2013 13:16:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pt5OVUihgeJI; Wed, 16 Oct 2013 13:16:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 11BA2264F3; Wed, 16 Oct 2013 13:16:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1C6CB1C0FD0 for ; Wed, 16 Oct 2013 13:16:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1578A8963D for ; Wed, 16 Oct 2013 13:16:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DfOwzxO0t59L for ; Wed, 16 Oct 2013 13:16:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail02.metso.com (mail02.metso.com [194.197.81.16]) by whitealder.osuosl.org (Postfix) with ESMTPS id C94E9883F9 for ; Wed, 16 Oct 2013 13:16:05 +0000 (UTC) X-AuditID: c2c55110-b7fcb8e000003d16-ee-525e9193e653 Received: from jklh28n.eu2.mnet (jklh28.metso.com [139.74.169.68]) by mail02.metso.com (Symantec Messaging Gateway) with SMTP id 6A.0E.15638.3919E525; Wed, 16 Oct 2013 16:16:03 +0300 (EEST) Received: from localhost.localdomain ([139.74.140.173]) by emen22n.eu2.mnet (Lotus Domino Release 8.5.3FP3) with ESMTP id 2013101616160240-12099 ; Wed, 16 Oct 2013 16:16:02 +0300 From: Denis Mingulov To: buildroot@busybox.net Date: Wed, 16 Oct 2013 16:13:37 +0300 Message-Id: <1381929217-13399-1-git-send-email-denis@mingulov.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1381923631-26549-1-git-send-email-denis@mingulov.com> References: <1381923631-26549-1-git-send-email-denis@mingulov.com> X-MIMETrack: Itemize by SMTP Server on EMEN22/SERVER(Release 8.5.3FP3|November 15, 2012) at 16.10.2013 16:16:02, Serialize by Router on JKLH28/SERVER(Release 8.5.3FP1|March 07, 2012) at 16.10.2013 16:16:03, Serialize complete at 16.10.2013 16:16:03 X-Brightmail-Tracker: H4sIAAAAAAAAA12Sf2xTVRTHva9d+7b1jru3sR0q48cT1JE4xuIfBQeCEJiTKHb/EGGbr9uj bWjX5b2WMAmxEB1N0XWwiDIEf0VgNBHY1LQYtqWwAMYw1NkUs82ixq2NGbha7AwS33tbZ+c/ L+d9zvl+z7n3XFrFHKP1tLXJyQtNnI3V5KgPV3dteqrjSJ2x/Ms7yw0j3dhw6IOYZj1VFTsd UVeFP/6c2ka9kltp4px7aqzmppXrXs21uE+2qZr9ur1nOze60fkcL8qmgTwNDwdj2um4CG6N ntd4UQ7NkD4EyfF3sqZ/hhCkwn9lyVUaUgo9I11IjgvJAoh2nlViFXkC4v63lLiA1IDHl1Tq 1WQ5DMauKB0weQ5+TXVQXkRL3RbBnfu1Ms4mG+FWa1yRMlLJcOiiSu4LxE2BLxnRtqO8D9Ej 5xCxc1ZbeUWZnXeKjrIGh70bSVcRGniZBFBvsDSECI1YHT7zep2RyeL2iC32EHqJptj5+JhH QnkmR2OLhRMt9YLLxotsIW7zSRjPYpPLtptdhO8e2mFkimep6BKbrQ1Wh0usdwm2EAJaJUm3 18jSRq7lNV5wTBuG0KO0mi3Gp6HWyBAz5+R383wzL6Sz22maBXy8XRLmC7yZ37vLanOm05Iu 9LaUIZkZZaCleGx4p5HRZyb+PxNFZ8ufnBDaSuuk6bqUg4nNnF20mmcaFOC1MtWlqWJegr/w SKctSsO5xl+jHfpiHJNlRK6wuJpmB9YXYZUsnZeRkC31S7Ba5gsy+FzX9PuNoz+QtLACHFTm kp73f8MyeKsMc2egMutCfE02nj/D5ppWfCp5kZQGOk7cRnAqkERwPRFUwfXIu2p4L+DOgjeP HNTCd5c6tZD03NRCx0gUw9XWWB5MXf52HnzV686HCU9/vlTSVwJDibbF8Gff2GOQuHtlGfRd 63kShqdSK+D2ZNwAp3ofGGD894OrIZG6twa+SZ6phIcDP1dCz1D/enj/76MbYPSfA5uhO3Fu M4y2jlVBT/SnavhxMFodlzZESRv6RKiVN+TknJkbuiRTXZrObCggw6I0nHtsvRs9n7dhgnx/ krlQMfnZ/dLHd7HmkkRZIFzWf/WAaaXh2f0vOn0lYvW+tTfYE1sW+o83Ntx746J42Kea0q+u qaNcXo/wi3+wd1OisNG7zDKQWNo1cbTcb1v1g2483Ekz9Vx8dE10Mnih8rIpsqTlmReCN7Hj Rv62j36LtO8Pq3cOr2PVooVbtUIliNy/VCSJVqkEAAA= Subject: [Buildroot] [PATCH v2] rsync: use system zlib and popt, also do not lose debug options X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/rsync/Config.in | 2 ++ package/rsync/rsync.mk | 7 +++++-- 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))