@@ -14,7 +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)
+GIT_CONF_ENV_LIBS += $(if $(BR2_STATIC_LIBS),-lssl -lcrypto)
else
GIT_CONF_OPTS += --without-openssl
endif
@@ -55,9 +55,20 @@ else
GIT_CONF_OPTS += --without-tcltk
endif
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+GIT_DEPENDENCIES += gettext
+GIT_CONF_ENV += ac_cv_lib_c_gettext=no
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+GIT_DEPENDENCIES += zlib
+GIT_CONF_ENV_LIBS += -lz
+endif
+
+
# assume yes for these tests, configure will bail out otherwise
# saying error: cannot run test program while cross compiling
-GIT_CONF_ENV = \
+GIT_CONF_ENV += \
ac_cv_fread_reads_directories=yes \
ac_cv_snprintf_returns_bogus=yes LIBS='$(GIT_CONF_ENV_LIBS)'
Add missing ssl, zlib and gettext library for static compilation support. A statically compiled libcurl need to be linked with some libraries to get all its undefined symbols resolved. Indeed when libcurl supports openssl it needs -lssl to satisfy all its dependencies, the same goes for gettext and zlib symbols. Signed-off-by: Remi Pommarel <repk@triplefau.lt> --- package/git/git.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)