Skip to contentSkip to conversation

libostree: override path to gpg-error-config

PATCH New Marcus Folkesson 2 participants 2 messages Jul 27, 2018 – Jul 28, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 libostree: override path to gpg-error-config

libostree has begun to use gpg-error-config in their configuration script.
Point out gpg-error-config in staging dir to avoid using the one installed on the host system.

Fixes:
http://autobuild.buildroot.net/results/447b96e449e881cf1bd9644cda0f386aa4c75724

---

Notes:
v2:
- override GPG_ERROR_CONFIG instead of ac_cv_path_GPG_ERROR_CONFIG
v3:
- depend on libgpg-error

 package/libostree/Config.in    | 5 +++--
 package/libostree/libostree.mk | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
package/libostree/Config.in +3 -2
index b62f4ea0a1..4a6ab5464f 100644
@@ -1,15 +1,16 @@
 config BR2_PACKAGE_LIBOSTREE
 	bool "libostree"
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libgpg-error
 	depends on !BR2_STATIC_LIBS # libfuse
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_USE_MMU # e2fsprogs, libfuse,libglib2, libgpgme
+	depends on BR2_USE_MMU # e2fsprogs, libfuse, libglib2, libgpgme
 	# doesn't build with musl due to lack of TEMP_FAILURE_RETRY()
 	depends on !BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_LIBFUSE
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBGPG_ERROR
 	select BR2_PACKAGE_LIBGPGME
 	select BR2_PACKAGE_XZ
 	help
package/libostree/libostree.mk +2 -1
index 24eda0d1db..48eff74574 100644
@@ -10,8 +10,9 @@ LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOST
 
 LIBOSTREE_LICENSE = LGPL-2.0+
 LIBOSTREE_LICENSE_FILES = COPYING
-LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpgme xz
+LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpg-error libgpgme xz
 LIBOSTREE_INSTALL_STAGING = YES
+LIBOSTREE_CONF_ENV = GPG_ERROR_CONFIG=$(STAGING_DIR)/usr/bin/gpg-error-config
 
 LIBOSTREE_CONF_OPTS += \
 	--with-gpgme-prefix=$(STAGING_DIR)/usr \
Signature · 1 line
2.18.0
#1 lore raw

PATCH v3 1/1 libostree: override path to gpg-error-config

Quoted 9 lines · Marcus Folkesson

libostree has begun to use gpg-error-config in their configuration script.
Point out gpg-error-config in staging dir to avoid using the one installed on the host system.

Fixes:
http://autobuild.buildroot.net/results/447b96e449e881cf1bd9644cda0f386aa4c75724

Applied to master, thanks.

Regards,
Arnout

Quoted 51 lines

---

Notes:
v2:
- override GPG_ERROR_CONFIG instead of ac_cv_path_GPG_ERROR_CONFIG
v3:
- depend on libgpg-error

 package/libostree/Config.in    | 5 +++--
 package/libostree/libostree.mk | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
package/libostree/Config.in +3 -2
index b62f4ea0a1..4a6ab5464f 100644
@@ -1,15 +1,16 @@
 config BR2_PACKAGE_LIBOSTREE
 	bool "libostree"
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libgpg-error
 	depends on !BR2_STATIC_LIBS # libfuse
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_USE_MMU # e2fsprogs, libfuse,libglib2, libgpgme
+	depends on BR2_USE_MMU # e2fsprogs, libfuse, libglib2, libgpgme
 	# doesn't build with musl due to lack of TEMP_FAILURE_RETRY()
 	depends on !BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_LIBFUSE
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBGPG_ERROR
 	select BR2_PACKAGE_LIBGPGME
 	select BR2_PACKAGE_XZ
 	help
package/libostree/libostree.mk +2 -1
index 24eda0d1db..48eff74574 100644
@@ -10,8 +10,9 @@ LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOST
 
 LIBOSTREE_LICENSE = LGPL-2.0+
 LIBOSTREE_LICENSE_FILES = COPYING
-LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpgme xz
+LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpg-error libgpgme xz
 LIBOSTREE_INSTALL_STAGING = YES
+LIBOSTREE_CONF_ENV = GPG_ERROR_CONFIG=$(STAGING_DIR)/usr/bin/gpg-error-config
 
 LIBOSTREE_CONF_OPTS += \
 	--with-gpgme-prefix=$(STAGING_DIR)/usr \
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF