Skip to contentSkip to conversation

atk: remove unrecognized configure options

PATCH New Fabrice Fontaine 2 participants 5 messages Dec 3, 2018 – Jan 2, 2019

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/2 atk: remove unrecognized configure options

Remove --disable-glibtest and --enable-explicit-deps, these options are
not recognized:
configure: WARNING: unrecognized options: --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --disable-glibtest, --enable-explicit-deps

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/atk/atk.mk | 1 -
 1 file changed, 1 deletion(-)
package/atk/atk.mk +0 -1
index 64950bfd08..babb00d244 100644
@@ -12,7 +12,6 @@ ATK_LICENSE = LGPL-2.0+
 ATK_LICENSE_FILES = COPYING
 ATK_INSTALL_STAGING = YES
 ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
-ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
 ATK_DEPENDENCIES = libglib2 host-pkgconf
 
 $(eval $(autotools-package))
Signature · 1 line
2.14.1
author
#1 lore raw

PATCH 2/2 atk: bump to version 2.30.0

- Switch to meson-package
- Remove ATK_INSTALL_STAGING_OPTS and host-pkgconf: not needed anymore
- Add hash for license file
- This bump fix the issue with glib 2.58.1 (because meson does not use pkgconfig to find glib-genmarshal):
/bin/bash: /usr/bin/glib-genmarshal: No such file or directory

Fixes:
- http://autobuild.buildroot.org/results/23cf5227c21365cda0babf1922425f8adaa97fba

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/atk/atk.hash | 7 +++++--
 package/atk/atk.mk   | 9 ++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)
package/atk/atk.hash +5 -2
index 80aeecaee9..911e65fcc7 100644
@@ -1,2 +1,5 @@
-# From http://ftp.gnome.org/pub/gnome/sources/atk/2.28/atk-2.28.1.sha256sum
-sha256 cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc atk-2.28.1.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/atk/2.30/atk-2.30.0.sha256sum
+sha256 dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b atk-2.30.0.tar.xz
+
+# Hash for license file
+sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
package/atk/atk.mk +4 -5
index babb00d244..228b24a7da 100644
@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-ATK_VERSION_MAJOR = 2.28
-ATK_VERSION = $(ATK_VERSION_MAJOR).1
+ATK_VERSION_MAJOR = 2.30
+ATK_VERSION = $(ATK_VERSION_MAJOR).0
 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
 ATK_LICENSE = LGPL-2.0+
 ATK_LICENSE_FILES = COPYING
 ATK_INSTALL_STAGING = YES
-ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
-ATK_DEPENDENCIES = libglib2 host-pkgconf
+ATK_DEPENDENCIES = libglib2
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
Signature · 1 line
2.14.1
#2 lore raw

PATCH 2/2 atk: bump to version 2.30.0

Hello,

Quoted 7 lines · Fabrice Fontaine

- Switch to meson-package
- Remove ATK_INSTALL_STAGING_OPTS and host-pkgconf: not needed anymore
- Add hash for license file
- This bump fix the issue with glib 2.58.1 (because meson does not use pkgconfig to find glib-genmarshal):
/bin/bash: /usr/bin/glib-genmarshal: No such file or directory

Quoted 8 lines

Fixes:
- http://autobuild.buildroot.org/results/23cf5227c21365cda0babf1922425f8adaa97fba

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/atk/atk.hash | 7 +++++--
 package/atk/atk.mk   | 9 ++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

I've adjust the commit log, because it no longer fixes any build failure, and I've applied to master. Thanks!

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/2 atk: bump to version 2.30.0

In reply to Fabrice Fontaine

Hello,

Quoted 9 lines · Fabrice Fontaine

- Switch to meson-package
- Remove ATK_INSTALL_STAGING_OPTS and host-pkgconf: not needed anymore
- Add hash for license file
- This bump fix the issue with glib 2.58.1 (because meson does not use pkgconfig to find glib-genmarshal):
/bin/bash: /usr/bin/glib-genmarshal: No such file or directory

Fixes:
- http://autobuild.buildroot.org/results/23cf5227c21365cda0babf1922425f8adaa97fba

This causes a build failure in BR2_STATIC_LIBS=y configurations. Seems like the meson build system always wants to build a dynamic library:

http://autobuild.buildroot.net/?reason=atk-2.30.0

Rather than adding a !BR2_STATIC_LIBS dependency, it would be nice to teach meson to build only a static library.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Applied
#4 lore raw

PATCH 1/2 atk: remove unrecognized configure options

In reply to Fabrice Fontaine

Hello,

Quoted 8 lines · Fabrice Fontaine

Remove --disable-glibtest and --enable-explicit-deps, these options are
not recognized:
configure: WARNING: unrecognized options: --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --disable-glibtest, --enable-explicit-deps

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/atk/atk.mk | 1 -
 1 file changed, 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com