| Message ID | 20170704144920.12318-32-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
On 04-07-17 16:48, Thomas Petazzoni wrote: > This commit switches to use the new gettext logic, which involves > using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies > on gettext/host-gettext. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/git/git.mk | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/package/git/git.mk b/package/git/git.mk > index 9cc88dd..23ace0f 100644 > --- a/package/git/git.mk > +++ b/package/git/git.mk > @@ -9,11 +9,7 @@ GIT_SOURCE = git-$(GIT_VERSION).tar.xz > GIT_SITE = https://www.kernel.org/pub/software/scm/git > GIT_LICENSE = GPL-2.0, LGPL-2.1+ > GIT_LICENSE_FILES = COPYING LGPL-2.1 > -GIT_DEPENDENCIES = zlib host-gettext You dropped the host-gettext dependency, was that intentional? Regards, Arnout > - > -ifeq ($(BR2_PACKAGE_GETTEXT),y) > -GIT_DEPENDENCIES += gettext > -endif > +GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > GIT_DEPENDENCIES += openssl >
Hello, On Tue, 4 Jul 2017 23:59:27 +0200, Arnout Vandecappelle wrote: > > -GIT_DEPENDENCIES = zlib host-gettext > > You dropped the host-gettext dependency, was that intentional? Yes: when NLS support is disabled, host-gettext is not needed. When NLS support is enabled, host-gettext is brought in by TARGET_NLS_DEPENDENCIES in: > > +GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) Best regards, Thomas
diff --git a/package/git/git.mk b/package/git/git.mk index 9cc88dd..23ace0f 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -9,11 +9,7 @@ GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 -GIT_DEPENDENCIES = zlib host-gettext - -ifeq ($(BR2_PACKAGE_GETTEXT),y) -GIT_DEPENDENCIES += gettext -endif +GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += openssl
This commit switches to use the new gettext logic, which involves using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies on gettext/host-gettext. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/git/git.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)