Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory
@ 2020-02-01 11:04 Fabrice Fontaine
  2020-02-01 11:04 ` [Buildroot] [PATCH 2/2] package/file: drop host-file Fabrice Fontaine
  2020-02-01 22:04 ` [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory Yann E. MORIN
  0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-02-01 11:04 UTC (permalink / raw)
  To: buildroot

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>
---
 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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/file: drop host-file
  2020-02-01 11:04 [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory Fabrice Fontaine
@ 2020-02-01 11:04 ` Fabrice Fontaine
  2020-02-01 22:14   ` Yann E. MORIN
  2020-02-01 22:04 ` [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory Yann E. MORIN
  1 sibling, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2020-02-01 11:04 UTC (permalink / raw)
  To: buildroot

file does not need a dependency on host-file and as host-file was only
used by file, drop host-file altogether

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/file/file.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index 42f9524ed1..b2e1e7c171 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -6,15 +6,12 @@
 
 FILE_VERSION = 5.38
 FILE_SITE = ftp://ftp.astron.com/pub/file
-FILE_DEPENDENCIES = host-file
-HOST_FILE_DEPENDENCIES = host-zlib
 FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 FILE_INSTALL_STAGING = YES
 FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file)
 FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
 # We're patching configure.ac
 FILE_AUTORECONF = YES
-HOST_FILE_CONF_OPTS = --disable-libseccomp
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 FILE_CONF_OPTS += --enable-bzlib
@@ -45,4 +42,3 @@ FILE_CONF_OPTS += --disable-zlib
 endif
 
 $(eval $(autotools-package))
-$(eval $(host-autotools-package))
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory
  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:04 ` Yann E. MORIN
  1 sibling, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2020-02-01 22:04 UTC (permalink / raw)
  To: buildroot

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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/file: drop host-file
  2020-02-01 11:04 ` [Buildroot] [PATCH 2/2] package/file: drop host-file Fabrice Fontaine
@ 2020-02-01 22:14   ` Yann E. MORIN
  0 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2020-02-01 22:14 UTC (permalink / raw)
  To: buildroot

Fabrice, All,

On 2020-02-01 12:04 +0100, Fabrice Fontaine spake thusly:
> file does not need a dependency on host-file and as host-file was only
> used by file, drop host-file altogether
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

That dependendcy was dded in 2005, with a message stating (roughly) that
we need to have a file version on the host that is not older than the
version on the target.

And indeed, it does not build on my autobuilder, with this error message
(yes, file is nice enough to not fail miserably and provide a useful
message):

    Making all in magic
    Cannot use the installed version of file (5.14) to
    cross-compile file 5.38
    Please install file 5.38 locally first

So, I'll reject this patch.

Regards,
Yann E. MORIN.

> ---
>  package/file/file.mk | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/package/file/file.mk b/package/file/file.mk
> index 42f9524ed1..b2e1e7c171 100644
> --- a/package/file/file.mk
> +++ b/package/file/file.mk
> @@ -6,15 +6,12 @@
>  
>  FILE_VERSION = 5.38
>  FILE_SITE = ftp://ftp.astron.com/pub/file
> -FILE_DEPENDENCIES = host-file
> -HOST_FILE_DEPENDENCIES = host-zlib
>  FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
>  FILE_INSTALL_STAGING = YES
>  FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file)
>  FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
>  # We're patching configure.ac
>  FILE_AUTORECONF = YES
> -HOST_FILE_CONF_OPTS = --disable-libseccomp
>  
>  ifeq ($(BR2_PACKAGE_BZIP2),y)
>  FILE_CONF_OPTS += --enable-bzlib
> @@ -45,4 +42,3 @@ 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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-01 22:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [Buildroot] [PATCH 1/2] package/file: zlib is optional, not mandatory 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