From: Baruch Siach <baruch@tkos.co.il>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/3] package/git: Add needed library for static compilation
Date: Tue, 27 Oct 2015 07:32:06 +0200 [thread overview]
Message-ID: <20151027053206.GH2229@tarshish> (raw)
In-Reply-To: <1445893962-13338-2-git-send-email-repk@triplefau.lt>
Hi Remi,
On Mon, Oct 26, 2015 at 10:12:40PM +0100, Remi Pommarel wrote:
> 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(-)
>
> diff --git a/package/git/git.mk b/package/git/git.mk
> index 2bd6a01..942f29f 100644
> --- a/package/git/git.mk
> +++ b/package/git/git.mk
> @@ -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)
zlib is always selected. You should not remove it.
Also, since you seem to fix the libcurl issue in later patches is this still
needed at all?
> 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
Are you sure this fixes a static build issue? If not, please make a separate
patch for this part.
> +ifeq ($(BR2_PACKAGE_ZLIB),y)
> +GIT_DEPENDENCIES += zlib
> +GIT_CONF_ENV_LIBS += -lz
> +endif
This part should not be needed. zlib is already in GIT_DEPENDENCIES (above),
-lz should be in GIT_CONF_ENV_LIBS for static build, and BR2_PACKAGE_ZLIB is
always selected.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
next prev parent reply other threads:[~2015-10-27 5:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-26 21:12 [Buildroot] [PATCH 0/3] package/git: Fix static compilation Remi Pommarel
2015-10-26 21:12 ` [Buildroot] [PATCH 1/3] package/git: Add needed library for " Remi Pommarel
2015-10-27 5:32 ` Baruch Siach [this message]
2015-10-28 8:16 ` Remi Pommarel
2015-10-28 8:27 ` Baruch Siach
2015-10-26 21:12 ` [Buildroot] [PATCH 2/3] package/git: Add git patch " Remi Pommarel
2015-10-27 22:48 ` Arnout Vandecappelle
2015-10-26 21:12 ` [Buildroot] [PATCH 3/3] package/git: Used curl-config program for target Remi Pommarel
2015-10-27 23:07 ` Arnout Vandecappelle
2015-10-28 8:23 ` Remi Pommarel
2015-10-28 8:32 ` Arnout Vandecappelle
-- strict thread matches above, loose matches on Subject: below --
2015-10-26 21:06 [Buildroot] [PATCH 0/3] package/git: Fix static compilation Remi Pommarel
2015-10-26 21:06 ` [Buildroot] [PATCH 1/3] package/git: Add needed library for " Remi Pommarel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151027053206.GH2229@tarshish \
--to=baruch@tkos.co.il \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox