git: fix static link with openssl
PATCH 1/1 git: fix static link with openssl
openssl needs -lz when building statically.
Fixes:
http://autobuild.buildroot.net/results/4b3/4b33f3f415776cf43be0910b583d222711a03cad/
Signed-off-by Baruch Siach <[email protected]>
--- package/git/git.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
package/git/git.mk +4 -3
@@ -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))
Signature · 1 line
2.1.4
PATCH 1/1 git: fix static link with openssl
Dear Baruch,
Reviewed-by Vicente Olivert Riera <[email protected]>
$ 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
PATCH 1/1 git: fix static link with openssl
In reply to Baruch SiachQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
openssl needs -lz when building statically.
Fixes:
http://autobuild.buildroot.net/results/4b3/4b33f3f415776cf43be0910b583d222711a03cad/Signed-off-by Baruch Siach <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard