From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory
Date: Sat, 1 Feb 2020 23:04:10 +0100 [thread overview]
Message-ID: <20200201220410.GA21372@scaer> (raw)
In-Reply-To: <20200201110427.1682488-1-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2020-02-01 12:04 +0100, Fabrice Fontaine spake thusly:
> zlib is optional since version 4.22 and
> https://github.com/file/file/commit/b950f1f426f8855e69d6f3dcc32067e931e015b7
> and --enable-zlib has been fixed since version 5.37 and
> https://github.com/file/file/commit/8c6dcd7ef690e90a3e897e8f886513750ed2c04d
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Now that I've found a power plug and my battery can charge again: applied
to master, thanks. ;-)
Regards,
Yann E. MORIN.
> ---
> package/file/Config.in | 1 -
> package/file/file.mk | 9 ++++++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/file/Config.in b/package/file/Config.in
> index 13934b2239..edc4d874b2 100644
> --- a/package/file/Config.in
> +++ b/package/file/Config.in
> @@ -1,6 +1,5 @@
> config BR2_PACKAGE_FILE
> bool "file"
> - select BR2_PACKAGE_ZLIB
> help
> Program to identify a file's format by scanning binary data
> for known patterns.
> diff --git a/package/file/file.mk b/package/file/file.mk
> index cff59c86ad..42f9524ed1 100644
> --- a/package/file/file.mk
> +++ b/package/file/file.mk
> @@ -6,7 +6,7 @@
>
> FILE_VERSION = 5.38
> FILE_SITE = ftp://ftp.astron.com/pub/file
> -FILE_DEPENDENCIES = host-file zlib
> +FILE_DEPENDENCIES = host-file
> HOST_FILE_DEPENDENCIES = host-zlib
> FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
> FILE_INSTALL_STAGING = YES
> @@ -37,5 +37,12 @@ else
> FILE_CONF_OPTS += --disable-xzlib
> endif
>
> +ifeq ($(BR2_PACKAGE_ZLIB),y)
> +FILE_CONF_OPTS += --enable-zlib
> +FILE_DEPENDENCIES += zlib
> +else
> +FILE_CONF_OPTS += --disable-zlib
> +endif
> +
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
> --
> 2.24.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. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2020-02-01 22:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-01 11:04 [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory Fabrice Fontaine
2020-02-01 11:04 ` [Buildroot] [PATCH 2/2] package/file: drop host-file Fabrice Fontaine
2020-02-01 22:14 ` Yann E. MORIN
2020-02-01 22:04 ` Yann E. MORIN [this message]
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=20200201220410.GA21372@scaer \
--to=yann.morin.1998@free.fr \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.