* [Buildroot] [PATCH 1/1] package/libnids: disable libglib2 only if not available
@ 2020-06-23 18:35 Guillaume W. Bres
2020-06-23 19:36 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Guillaume W. Bres @ 2020-06-23 18:35 UTC (permalink / raw)
To: buildroot
Take advantage of a possibly existing BR2_PACKAGE_LIBGLIB2
Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com>
---
package/libnids/libnids.mk | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk
index ee7c71ee88..83719a712f 100644
--- a/package/libnids/libnids.mk
+++ b/package/libnids/libnids.mk
@@ -12,8 +12,13 @@ LIBNIDS_INSTALL_STAGING = YES
LIBNIDS_DEPENDENCIES = host-pkgconf libpcap
LIBNIDS_AUTORECONF = YES
LIBNIDS_CONF_OPTS = \
- --disable-libglib \
--disable-libnet
+
+# disable libglib2 if not available
+ifeq ($(BR2_PACKAGE_LIBGLIB2),n)
+LIBNIDS_CONF_OPTS += --disable-libglib
+endif
+
# hand-written Makefile.in, not using automake, needs a custom
# variable for the installation path.
LIBNIDS_INSTALL_STAGING_OPTS = install_prefix=$(STAGING_DIR) install
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/libnids: disable libglib2 only if not available
2020-06-23 18:35 [Buildroot] [PATCH 1/1] package/libnids: disable libglib2 only if not available Guillaume W. Bres
@ 2020-06-23 19:36 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2020-06-23 19:36 UTC (permalink / raw)
To: buildroot
Guillaume, All,
On 2020-06-23 20:35 +0200, Guillaume W. Bres spake thusly:
> Take advantage of a possibly existing BR2_PACKAGE_LIBGLIB2
>
> Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com>
Thanks, applied to master, with the following changes:
- add missing dependency on libglib2
- expand commit log to explain why we don't --enable-libglib
- add a simmilar blurb in the .mk
- fix condition, use positive logic since we have an else-clause
Please see the resulting commit for inspiration for your future
contributions! ;-)
Regards,
Yann E. MORIN.
> ---
> package/libnids/libnids.mk | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk
> index ee7c71ee88..83719a712f 100644
> --- a/package/libnids/libnids.mk
> +++ b/package/libnids/libnids.mk
> @@ -12,8 +12,13 @@ LIBNIDS_INSTALL_STAGING = YES
> LIBNIDS_DEPENDENCIES = host-pkgconf libpcap
> LIBNIDS_AUTORECONF = YES
> LIBNIDS_CONF_OPTS = \
> - --disable-libglib \
> --disable-libnet
> +
> +# disable libglib2 if not available
> +ifeq ($(BR2_PACKAGE_LIBGLIB2),n)
> +LIBNIDS_CONF_OPTS += --disable-libglib
> +endif
> +
> # hand-written Makefile.in, not using automake, needs a custom
> # variable for the installation path.
> LIBNIDS_INSTALL_STAGING_OPTS = install_prefix=$(STAGING_DIR) install
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-23 19:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-23 18:35 [Buildroot] [PATCH 1/1] package/libnids: disable libglib2 only if not available Guillaume W. Bres
2020-06-23 19:36 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox