Commit 77754571 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

pkgconfig: add pkgconfig package for target

The host versions shouldn't be visible in Kconfig, so remove the
reference to BR2_PACKAGE_PKGCONFIG everywhere and prefix the host targets
with host-.

At the same time add pkgconfig for the target (E.G. for development) and
let BR2_PACKAGE_PKGCONFIG control that package.

Notice: all defconfigs in the tree have been updated, but make sure to
disable the pkgconfig package (unless you want it) if you use an external
config, otherwise you'll end up with pkgconfig and glib2 in the target.
parent 344d59d7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ endif
     <a name="ex1line9" id="ex1line9">9</a>  FOO_INSTALL_STAGING = YES
     <a name="ex1line10" id="ex1line10">10</a>  FOO_INSTALL_TARGET = YES
     <a name="ex1line11" id="ex1line11">11</a>  FOO_CONF_OPT =  --enable-shared
     <a name="ex1line12" id="ex1line12">12</a>  FOO_DEPENDENCIES = libglib2 pkgconfig
     <a name="ex1line12" id="ex1line12">12</a>  FOO_DEPENDENCIES = libglib2 host-pkgconfig
     <a name="ex1line13" id="ex1line13">13</a>  $(eval $(call AUTOTARGETS,package,foo))
</pre>

+0 −1
Original line number Diff line number Diff line
config BR2_PACKAGE_ATK
	bool "atk"
	select BR2_PACKAGE_PKGCONFIG
	select BR2_PACKAGE_LIBGLIB2
	help
	  The ATK accessibility toolkit, needed to build GTK+-2.x.
+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,6 @@ ATK_CONF_OPT = --enable-shared \
		--disable-glibtest --enable-explicit-deps=no \
		--disable-debug

ATK_DEPENDENCIES = libglib2 pkgconfig
ATK_DEPENDENCIES = libglib2 host-pkgconfig

$(eval $(call AUTOTARGETS,package,atk))
+0 −1
Original line number Diff line number Diff line
config BR2_PACKAGE_CAIRO
	bool "cairo"
	select BR2_PACKAGE_PKGCONFIG
	select BR2_PACKAGE_PIXMAN
	select BR2_PACKAGE_FONTCONFIG
	help
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
		ac_use_included_regex=no gl_cv_c_restrict=no

CAIRO_DEPENDENCIES = uclibc pkgconfig fontconfig pixman
CAIRO_DEPENDENCIES = uclibc host-pkgconfig fontconfig pixman

ifeq ($(BR2_PACKAGE_DIRECTFB),y)
	CAIRO_CONF_OPT += --enable-directfb
Loading