jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/gvfs: fix static build with libarchive

Browse Source 
Use pkg-config to retrieve static dependencies of libarchive in gvfs.mk
instead of patching configure.ac as upstream switched to meson

Fixes:
 - http://autobuild.buildroot.org/results/486187bb7b8800f44a8c173af518b84e68e53584

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-10-27 08:33:17 +01:00 committed by Thomas Petazzoni
parent c930fa7656
commit 9b66547108
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/gvfs/gvfs.mk
View File

@ -13,12 +13,13 @@ GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info \
$(TARGET_NLS_DEPENDENCIES) $(TARGET_NLS_DEPENDENCIES)
GVFS_LICENSE = LGPL-2.0+ GVFS_LICENSE = LGPL-2.0+
GVFS_LICENSE_FILES = COPYING GVFS_LICENSE_FILES = COPYING
GVFS_LIBS = $(TARGET_NLS_LIBS)
# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent # Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent
# build system from searching the host paths. # build system from searching the host paths.
GVFS_CONF_ENV = \ GVFS_CONF_ENV = \
ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
LIBS=$(TARGET_NLS_LIBS) LIBS="$(GVFS_LIBS)"
# Most of these are missing library support # Most of these are missing library support
GVFS_CONF_OPTS = \ GVFS_CONF_OPTS = \
@ -60,6 +61,7 @@ GVFS_CONF_OPTS += \
--enable-archive \ --enable-archive \
--with-archive-includes=$(STAGING_DIR)/usr \ --with-archive-includes=$(STAGING_DIR)/usr \
--with-archive-libs=$(STAGING_DIR)/usr --with-archive-libs=$(STAGING_DIR)/usr
GVFS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libarchive`
else else
GVFS_CONF_OPTS += --disable-archive GVFS_CONF_OPTS += --disable-archive
endif endif