Patchwork git: needs zlib and host-gettext

login
register
mail settings
Submitter Gustavo Zacarias
Date June 3, 2013, 3:15 p.m.
Message ID <1370272548-32532-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/248311/
State Accepted
Commit f7dbc3a50061249a14d04627b9659304ebd1ea8c
Headers show

Comments

Gustavo Zacarias - June 3, 2013, 3:15 p.m.
host-gettext fixes:
http://autobuild.buildroot.net/results/a5b/a5b1bb708d62a9e296f05899f0984087fcf9e2ce/

zlib fixes:
http://autobuild.buildroot.net/results/08f/08f5ed4dd35ad1ce06dda7577aae87b9aa7069b2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/git/Config.in | 1 +
 package/git/git.mk    | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)
Peter Korsgaard - June 3, 2013, 8:53 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> host-gettext fixes:
 Gustavo> http://autobuild.buildroot.net/results/a5b/a5b1bb708d62a9e296f05899f0984087fcf9e2ce/

 Gustavo> zlib fixes:
 Gustavo> http://autobuild.buildroot.net/results/08f/08f5ed4dd35ad1ce06dda7577aae87b9aa7069b2/

Committed, thanks.

Patch

diff --git a/package/git/Config.in b/package/git/Config.in
index 31e5ffe..dc342aa 100644
--- a/package/git/Config.in
+++ b/package/git/Config.in
@@ -1,6 +1,7 @@ 
 config BR2_PACKAGE_GIT
 	bool "git"
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_ZLIB
 	help
 	  Git is a free and open source distributed version control system
 	  designed to handle everything from small to very large projects.
diff --git a/package/git/git.mk b/package/git/git.mk
index 408456b..6bc9761 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -8,10 +8,7 @@  GIT_VERSION         = 1.8.3
 GIT_SITE            = http://git-core.googlecode.com/files/
 GIT_LICENSE         = GPLv2 LGPLv2.1+
 GIT_LICENSE_FILES   = COPYING LGPL-2.1
-
-ifeq ($(BR2_PACKAGE_ZLIB),y)
-	GIT_DEPENDENCIES += zlib
-endif
+GIT_DEPENDENCIES    = zlib host-gettext
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	GIT_DEPENDENCIES += openssl