[Buildroot] [PATCH 1/1] package/glog: don't override dependencies

[Buildroot] [PATCH 1/1] package/glog: don't override dependencies

[Fabrice Fontaine]

Don't override GLOG_DEPENDENCIES in a conditional

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/glog/glog.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/glog/glog.mk b/package/glog/glog.mk
index 9d31732a88..2863e78345 100644
--- a/package/glog/glog.mk
+++ b/package/glog/glog.mk
@@ -13,7 +13,7 @@ GLOG_CONF_OPTS = \
 	$(if $(BR2_TOOLCHAIN_HAS_THREADS),-DWITH_THREADS=ON, -DWITH_THREADS=OFF)
 
 ifeq ($(BR2_PACKAGE_GFLAGS),y)
-GLOG_DEPENDENCIES = gflags
+GLOG_DEPENDENCIES += gflags
 GLOG_CONF_OPTS += -DWITH_GFLAGS=ON
 else
 GLOG_CONF_OPTS += -DWITH_GFLAGS=OFF
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/glog: don't override dependencies

[Yann E. MORIN]

Fabrice, All,

On 2021-11-09 18:18 +0100, Fabrice Fontaine spake thusly:
> Don't override GLOG_DEPENDENCIES in a conditional
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/glog/glog.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/glog/glog.mk b/package/glog/glog.mk
> index 9d31732a88..2863e78345 100644
> --- a/package/glog/glog.mk
> +++ b/package/glog/glog.mk
> @@ -13,7 +13,7 @@ GLOG_CONF_OPTS = \
>  	$(if $(BR2_TOOLCHAIN_HAS_THREADS),-DWITH_THREADS=ON, -DWITH_THREADS=OFF)
>  
>  ifeq ($(BR2_PACKAGE_GFLAGS),y)
> -GLOG_DEPENDENCIES = gflags
> +GLOG_DEPENDENCIES += gflags
>  GLOG_CONF_OPTS += -DWITH_GFLAGS=ON
>  else
>  GLOG_CONF_OPTS += -DWITH_GFLAGS=OFF
> -- 
> 2.33.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/glog: don't override dependencies

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Don't override GLOG_DEPENDENCIES in a conditional
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x and 2021.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot