package/matchbox-lib: correctly fix the .pc file
First, the .pc file was so far fixed as a post-configure hook of the matchbox-fakekey package, by directly tweaking the .pc file installed in staging by matchbox-lib. That's uterly wrong and bad. So, we move the fix to matchbox-lib. Second, it was incorreclty tweaking the .pc file when xlib_libXft was not enabled, because only then a path to staging was present. Third, even when xlib_libXft was enabled, the tweaking was still wrong, because unnecessary. Fix all that. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
2cfda4704e
commit
84a2645e5b
|
@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
|
||||||
MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
|
MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
|
||||||
|
|
||||||
define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
|
define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
|
||||||
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
|
$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' \
|
||||||
$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
|
$(@D)/Makefile
|
||||||
endef
|
endef
|
||||||
|
|
||||||
MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
|
MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
|
||||||
|
|
|
@ -15,7 +15,8 @@ MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs
|
||||||
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
|
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
|
||||||
|
|
||||||
define MATCHBOX_LIB_POST_INSTALL_FIXES
|
define MATCHBOX_LIB_POST_INSTALL_FIXES
|
||||||
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \
|
$(SED) 's:-I$(STAGING_DIR)/:-I/:g' \
|
||||||
|
-e 's:-I/usr/include\( \|$$\)::g' \
|
||||||
$(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
|
$(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue