Skip to contentSkip to conversation

package/pkg-meson.mk: set correct pkgconfig for native dependencies

PATCH New James Hilliard 1 participant 2 messages Apr 28, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/pkg-meson.mk: set correct pkgconfig for native dependencies

This sets the correct build.pkg_config_path for all meson packages so that dependencies with native: true will properly use the the host pkgconfig instead of the target pkgconfig.

---
 package/pkg-meson.mk | 1 +
 1 file changed, 1 insertion(+)
package/pkg-meson.mk +1 -0
index 2ba10f30ed..0a4ab2194c 100644
@@ -87,6 +87,7 @@ define $(2)_CONFIGURE_CMDS
 		--default-library=$(if $(BR2_STATIC_LIBS),static,shared) \
 		--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
 		--cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \
+		-Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \
 		$$($$(PKG)_CONF_OPTS) \
 		$$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build
 endef
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/weston: drop pkgconfig workaround

We no longer need this package specific pkconfig workaround as it is now applied to all meson packages automatically.

---
 package/weston/weston.mk | 1 -
 1 file changed, 1 deletion(-)
package/weston/weston.mk +0 -1
index b22e685948..541c6ba024 100644
@@ -14,7 +14,6 @@ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
 	libxkbcommon pixman libpng jpeg udev cairo libinput libdrm
 
 WESTON_CONF_OPTS = \
-	-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \
 	-Dbackend-headless=false \
 	-Dcolor-management-colord=false \
 	-Dremoting=false
Signature · 1 line
2.20.1