Commit f1cdd306 authored by Baruch Siach's avatar Baruch Siach Committed by Peter Korsgaard
Browse files

git: fix static link with openssl 

openssl needs -lz when building statically.

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



Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 67b845fc

package/git/git.mk

+4 −3
Original line number Diff line number Diff line
@@ -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))