[Buildroot] [PATCH] git: fix static link with openssl

[Buildroot] [PATCH] git: fix static link with openssl

[Baruch Siach]

openssl needs -lz when building statically.

Fixes:
http://autobuild.buildroot.net/results/4b3/4b33f3f415776cf43be0910b583d222711a03cad/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/git/git.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/git/git.mk b/package/git/git.mk
index b5244aca0474..674095df6043 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -14,6 +14,7 @@ GIT_DEPENDENCIES = zlib host-gettext
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	GIT_DEPENDENCIES += openssl
 	GIT_CONF_OPTS += --with-openssl
+	GIT_CONF_ENV_LIBS += $(if $(BR2_STATIC_LIBS),-lz)
 else
 	GIT_CONF_OPTS += --without-openssl
 endif
@@ -41,7 +42,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 	GIT_DEPENDENCIES += libiconv
-	GIT_CONF_ENV += LIBS=-liconv
+	GIT_CONF_ENV_LIBS += -liconv
 	GIT_CONF_OPTS += --with-iconv=/usr/lib
 else
 	GIT_CONF_OPTS += --without-iconv
@@ -56,7 +57,7 @@ endif
 
 # assume yes for these tests, configure will bail out otherwise
 # saying error: cannot run test program while cross compiling
-GIT_CONF_ENV += ac_cv_fread_reads_directories=yes \
-	ac_cv_snprintf_returns_bogus=yes
+GIT_CONF_ENV = ac_cv_fread_reads_directories=yes \
+	ac_cv_snprintf_returns_bogus=yes LIBS='$(GIT_CONF_ENV_LIBS)'
 
 $(eval $(autotools-package))
-- 
2.1.4

[Buildroot] [PATCH] git: fix static link with openssl

[Vicente Olivert Riera]

Dear Baruch,

Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

$ grep -E ^BR2_PACKAGE_OPENSSL .config
BR2_PACKAGE_OPENSSL=y
$ grep -E ^BR2_PACKAGE_GIT .config
BR2_PACKAGE_GIT=y
$ file output/build/git-2.3.0/git
output/build/git-2.3.0/git: ELF 32-bit LSB executable, MIPS, MIPS32
version 1 (SYSV), statically linked, with unknown capability 0xf41 =
0x756e6700, with unknown capability 0x70100 = 0x3040000, not stripped

Best regards,
--
Vincent

[Buildroot] [PATCH] git: fix static link with openssl

[Peter Korsgaard]

>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > openssl needs -lz when building statically.
 > Fixes:
 > http://autobuild.buildroot.net/results/4b3/4b33f3f415776cf43be0910b583d222711a03cad/

> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed, thanks.

-- 
Bye, Peter Korsgaard