aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2009-03-18 19:19:10 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2009-03-18 19:19:10 +0000
commit77754571b2f327636ce0072cfabc9ce0c9a6ad86 (patch)
tree56fc2d3552653caaa20ee7577b1a04375f80bf28 /package
parent344d59d788d697f4f6704dd920cad615318e47be (diff)
downloadbuildroot-77754571b2f327636ce0072cfabc9ce0c9a6ad86.tar.gz
buildroot-77754571b2f327636ce0072cfabc9ce0c9a6ad86.tar.bz2
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.
Diffstat (limited to 'package')
-rw-r--r--package/atk/Config.in1
-rw-r--r--package/atk/atk.mk2
-rw-r--r--package/cairo/Config.in1
-rw-r--r--package/cairo/cairo.mk2
-rw-r--r--package/dbus-glib/Config.in1
-rw-r--r--package/dbus-glib/dbus-glib.mk2
-rw-r--r--package/dbus/Config.in1
-rw-r--r--package/dbus/dbus.mk2
-rw-r--r--package/docker/Config.in1
-rw-r--r--package/docker/docker.mk2
-rw-r--r--package/editors/vim/Config.in1
-rw-r--r--package/editors/vim/vim.mk2
-rw-r--r--package/expat/Config.in1
-rw-r--r--package/expat/expat.mk2
-rw-r--r--package/freetype/Config.in1
-rw-r--r--package/freetype/freetype.mk2
-rw-r--r--package/gettext/Config.in1
-rw-r--r--package/gettext/gettext.mk2
-rw-r--r--package/gmpc/Config.in1
-rw-r--r--package/gqview/Config.in1
-rw-r--r--package/gqview/gqview.mk2
-rw-r--r--package/hal/Config.in1
-rw-r--r--package/hal/hal.mk2
-rw-r--r--package/java/classpath/Config.in1
-rw-r--r--package/java/classpath/classpath.mk2
-rw-r--r--package/java/jamvm/Config.in1
-rw-r--r--package/java/jamvm/jamvm.mk2
-rw-r--r--package/libdaemon/Config.in1
-rw-r--r--package/libdaemon/libdaemon.mk2
-rw-r--r--package/libdrm/Config.in1
-rw-r--r--package/libdrm/libdrm.mk2
-rw-r--r--package/libglade/Config.in1
-rw-r--r--package/libglade/libglade.mk2
-rw-r--r--package/libglib2/Config.in1
-rw-r--r--package/libglib2/libglib2.mk2
-rw-r--r--package/libgtk2/Config.in1
-rw-r--r--package/libgtk2/libgtk2.mk2
-rw-r--r--package/libidn/libidn.mk2
-rw-r--r--package/libpng/Config.in1
-rw-r--r--package/libpng/libpng.mk2
-rw-r--r--package/libusb/Config.in1
-rw-r--r--package/libusb/libusb.mk2
-rw-r--r--package/libxslt/Config.in1
-rw-r--r--package/matchbox/Config.in1
-rw-r--r--package/matchbox/matchbox.mk2
-rw-r--r--package/midori/Config.in1
-rw-r--r--package/midori/midori.mk2
-rw-r--r--package/multimedia/gstreamer/Config.in1
-rw-r--r--package/multimedia/gstreamer/gstreamer.mk2
-rw-r--r--package/multimedia/libmpd/Config.in1
-rw-r--r--package/multimedia/libogg/Config.in1
-rw-r--r--package/multimedia/libogg/libogg.mk2
-rw-r--r--package/multimedia/libtheora/Config.in1
-rw-r--r--package/multimedia/libtheora/libtheora.mk2
-rw-r--r--package/multimedia/libvorbis/Config.in1
-rw-r--r--package/multimedia/libvorbis/libvorbis.mk4
-rw-r--r--package/neon/Config.in1
-rw-r--r--package/ntfs-3g/Config.in1
-rw-r--r--package/ntfs-3g/ntfs-3g.mk2
-rw-r--r--package/pango/Config.in1
-rw-r--r--package/pango/pango.mk2
-rw-r--r--package/pcmanfm/Config.in1
-rw-r--r--package/pcmanfm/pcmanfm.mk2
-rw-r--r--package/pkgconfig/Config.in1
-rw-r--r--package/pkgconfig/pkgconfig.mk38
-rw-r--r--package/sylpheed/Config.in1
-rw-r--r--package/sylpheed/sylpheed.mk2
-rw-r--r--package/tiff/tiff.mk2
-rw-r--r--package/x11r7/Config.in1
-rw-r--r--package/x11r7/xfont_font-util/xfont_font-util.mk2
70 files changed, 52 insertions, 90 deletions
diff --git a/package/atk/Config.in b/package/atk/Config.in
index f793d762ad..e7f75b391d 100644
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -1,6 +1,5 @@
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.
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index ac6f5059df..b75691431c 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -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))
diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index bd2845b3ca..e19efb5c49 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_CAIRO
bool "cairo"
- select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_FONTCONFIG
help
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 668f915c66..c1f80d7b11 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -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
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index 9779da7e8d..52c7e7ca4e 100644
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_DBUS_GLIB
bool "dbus-glib"
depends on BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_PKGCONFIG
help
GLib bindings for D-Bus.
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index d19acdf838..f0fc017cb7 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -23,7 +23,7 @@ DBUS_GLIB_CONF_OPT = --localstatedir=/var \
--disable-doxygen-docs \
--enable-asserts=yes
-DBUS_GLIB_DEPENDENCIES = uclibc pkgconfig dbus host-dbus host-dbus-glib libglib2
+DBUS_GLIB_DEPENDENCIES = uclibc host-pkgconfig dbus host-dbus host-dbus-glib libglib2
$(eval $(call AUTOTARGETS,package,dbus-glib))
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 9343d8c2c6..9b800d5e5b 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_DBUS
bool "dbus"
depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2
- select BR2_PACKAGE_PKGCONFIG
help
The D-Bus message bus system.
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 4c047012c4..02ad624f3e 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -16,7 +16,7 @@ else
DBUS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip STRIPPROG="$(STRIPCMD)"
endif
-DBUS_DEPENDENCIES = uclibc pkgconfig
+DBUS_DEPENDENCIES = uclibc host-pkgconfig
DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
DBUS_CONF_OPT = --program-prefix="" \
diff --git a/package/docker/Config.in b/package/docker/Config.in
index b424c29c51..1c89a79c85 100644
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_DOCKER
bool "docker"
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_PKGCONFIG
help
a system tray dock for X
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index fb4c4ecdaa..d86e88b3bb 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -19,7 +19,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
-DOCKER_DEPENDENCIES = uclibc pkgconfig libglib2 $(XSERVER)
+DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 $(XSERVER)
$(eval $(call AUTOTARGETS,package,docker))
diff --git a/package/editors/vim/Config.in b/package/editors/vim/Config.in
index 1ffc53da80..30b73d3051 100644
--- a/package/editors/vim/Config.in
+++ b/package/editors/vim/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_VIM
bool "vim"
select BR2_PACKAGE_NCURSES
- select BR2_PACKAGE_PKGCONFIG
help
VIM Text editor
diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk
index b0f0d059ac..d84e7c029d 100644
--- a/package/editors/vim/vim.mk
+++ b/package/editors/vim/vim.mk
@@ -75,7 +75,7 @@ ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
)
endif
-vim: uclibc pkgconfig ncurses vim-source $(TARGET_DIR)/usr/bin/vim
+vim: uclibc host-pkgconfig ncurses vim-source $(TARGET_DIR)/usr/bin/vim
#############################################################
#
diff --git a/package/expat/Config.in b/package/expat/Config.in
index f82700a01b..4a437abe8e 100644
--- a/package/expat/Config.in
+++ b/package/expat/Config.in
@@ -2,7 +2,6 @@
config BR2_PACKAGE_EXPAT
bool"expat"
- select BR2_PACKAGE_PKGCONFIG
help
The Expat XML Parser.
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index b8624b7727..4028a8f082 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -16,7 +16,7 @@ EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
EXPAT_CONF_OPT = --enable-shared
-EXPAT_DEPENDENCIES = uclibc pkgconfig
+EXPAT_DEPENDENCIES = uclibc host-pkgconfig
$(eval $(call AUTOTARGETS,package,expat))
diff --git a/package/freetype/Config.in b/package/freetype/Config.in
index aa5298b946..ba87aff41e 100644
--- a/package/freetype/Config.in
+++ b/package/freetype/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_FREETYPE
bool "freetype"
- select BR2_PACKAGE_PKGCONFIG
help
a free, high-quality and portable font engine.
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 2dfd9d3889..39ce0166ff 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -11,7 +11,7 @@ FREETYPE_LIBTOOL_PATCH = NO
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = YES
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib)
+FREETYPE_DEPENDENCIES = uclibc host-pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib)
$(eval $(call AUTOTARGETS,package,freetype))
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index 84784acb35..bd5950c12b 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_GETTEXT
bool "gettext"
- select BR2_PACKAGE_PKGCONFIG
help
The GNU `gettext' utilities are a set of tools that provide a
framework to help other GNU packages produce multi-lingual
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 2a0c33305c..c6e017849b 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -120,7 +120,7 @@ $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY)
autopoint envsubst gettext.sh gettextize msg* ?gettext)
touch -c $@
-gettext: uclibc pkgconfig $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
+gettext: uclibc host-pkgconfig $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
gettext-unpacked: $(GETTEXT_DIR)/.unpacked
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index a3e275c959..a8343617ee 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_GMPC
select BR2_PACKAGE_GETTEXT
select BR2_PACKAGE_LIBINTL
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
- select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_LIBMPD
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBGLADE
diff --git a/package/gqview/Config.in b/package/gqview/Config.in
index 9922df46af..6d06258c6f 100644
--- a/package/gqview/Config.in
+++ b/package/gqview/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_GQVIEW
bool "gqview"
- select BR2_PACKAGE_PKGCONFIG
help
GQview is an image viewer for Unix operating systems
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index cb3dfb2ad7..8d769209cf 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -10,7 +10,7 @@ GQVIEW_AUTORECONF = NO
GQVIEW_INSTALL_STAGING = NO
GQVIEW_INSTALL_TARGET = YES
-GQVIEW_DEPENDENCIES = uclibc pkgconfig libgtk2
+GQVIEW_DEPENDENCIES = uclibc host-pkgconfig libgtk2
$(eval $(call AUTOTARGETS,package,gqview))
diff --git a/package/hal/Config.in b/package/hal/Config.in
index 37dc9100d2..56ed42854f 100644
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -4,6 +4,5 @@ config BR2_PACKAGE_HAL
select BR2_PACKAGE_DBUS_GLIB
select BR2_PACKAGE_HWDATA
select BR2_PACKAGE_UDEV_VOLUME_ID
- select BR2_PACKAGE_PKGCONFIG
help
The Hardware Abstraction Layer (HAL) suite.
diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index 3ea77587d8..5042509e19 100644
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@@ -87,7 +87,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
done
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal*
-hal: uclibc pkgconfig dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY)
+hal: uclibc host-pkgconfig dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY)
hal-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf
diff --git a/package/java/classpath/Config.in b/package/java/classpath/Config.in
index 33837636dd..c6b5e5280f 100644
--- a/package/java/classpath/Config.in
+++ b/package/java/classpath/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_CLASSPATH
bool "classpath"
- select BR2_PACKAGE_PKGCONFIG
help
GNU Classpath, Essential Libraries for Java, is a GNU
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index 367b3d8021..faa6341434 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -53,7 +53,7 @@ CLASSPATH_CONF_OPT = \
--disable-debug \
--disable-gconf-peer --disable-examples --disable-plugin
-CLASSPATH_DEPENDENCIES = uclibc pkgconfig libpng jpeg tiff
+CLASSPATH_DEPENDENCIES = uclibc host-pkgconfig libpng jpeg tiff
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
CLASSPATH_DEPENDENCIES+= alsa-lib
diff --git a/package/java/jamvm/Config.in b/package/java/jamvm/Config.in
index 6e166dc422..59ac593aae 100644
--- a/package/java/jamvm/Config.in
+++ b/package/java/jamvm/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_JAMVM
bool "jamvm"
depends on BR2_PACKAGE_CLASSPATH
- select BR2_PACKAGE_PKGCONFIG
help
JamVM is a new Java Virtual Machine which conforms to
the JVM specification version 2 (blue book).
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index 560be34703..dff089af4d 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -49,7 +49,7 @@ JAMVM_CONF_OPT = \
--disable-debug --with-classpath-install-dir=/usr
-JAMVM_DEPENDENCIES = uclibc pkgconfig classpath
+JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath
#Include X libraries when we have an X server
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
diff --git a/package/libdaemon/Config.in b/package/libdaemon/Config.in
index 2c5c049fa3..69432630d6 100644
--- a/package/libdaemon/Config.in
+++ b/package/libdaemon/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBDAEMON
bool "libdaemon"
- select BR2_PACKAGE_PKGCONFIG
help
libdaemon is a lightweight C library that eases the
writing of UNIX daemons.
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index abc1556cb9..b38861a820 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -13,6 +13,6 @@ LIBDAEMON_INSTALL_TARGET:=YES
LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no
LIBDAEMON_CONF_OPT:=--disable-lynx
-LIBDAEMON_DEPENDENCIES:=uclibc pkgconfig
+LIBDAEMON_DEPENDENCIES:=uclibc host-pkgconfig
$(eval $(call AUTOTARGETS,package,libdaemon))
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 9680ee3519..3d8a731beb 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBDRM
bool "libdrm"
- select BR2_PACKAGE_PKGCONFIG
help
Direct Rendering Manager
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 672c148a0f..d3636e6430 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -61,7 +61,7 @@ $(TARGET_DIR)/usr/lib/libdrm.so: $(STAGING_DIR)/usr/lib/libdrm.so
cp -dpf $(STAGING_DIR)/usr/lib/libdrm.so* $(TARGET_DIR)/usr/lib/
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdrm.so
-libdrm: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libdrm.so
+libdrm: uclibc host-pkgconfig $(TARGET_DIR)/usr/lib/libdrm.so
libdrm-clean:
-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIBDRM_DIR) uninstall
diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index efed36bf77..2fb6eb60a5 100644
--- a/package/libglade/Config.in
+++ b/package/libglade/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBGLADE
bool "libglade"
depends on BR2_PACKAGE_LIBGTK2
- select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_ATK
select BR2_PACKAGE_LIBXML2
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 9b5aa30c01..786306173b 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -7,7 +7,7 @@ LIBGLADE_VERSION = 2.6.3
LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/
LIBGLADE_INSTALL_STAGING = YES
-LIBGLADE_DEPENDENCIES = pkgconfig libglib2 libgtk2 atk libxml2
+LIBGLADE_DEPENDENCIES = host-pkgconfig libglib2 libgtk2 atk libxml2
$(eval $(call AUTOTARGETS,package,libglade))
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 191370136d..30f47dd851 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT
select BR2_PACKAGE_LIBINTL
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
- select BR2_PACKAGE_PKGCONFIG
help
Low-level core library that forms the basis of GTK+ and GNOME.
Requires libglib2 (-dev) on the host.
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 50dc068168..6b4aa88110 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -51,7 +51,7 @@ LIBGLIB2_CONF_ENV = \
LIBGLIB2_CONF_OPT = --enable-shared \
--enable-static
-LIBGLIB2_DEPENDENCIES = uclibc gettext libintl pkgconfig host-libglib2
+LIBGLIB2_DEPENDENCIES = uclibc gettext libintl host-pkgconfig host-libglib2
ifneq ($(BR2_ENABLE_LOCALE),y)
LIBGLIB2_DEPENDENCIES+=libiconv
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 85d4a49510..19809f26e1 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_CAIRO_PDF
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PANGO
- select BR2_PACKAGE_PKGCONFIG
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
help
The GTK+ version 2 graphical user interface library
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 234e0db0eb..a259fff4a7 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -78,7 +78,7 @@ LIBGTK2_CONF_OPT = --enable-shared \
--enable-explicit-deps=no \
--disable-debug
-LIBGTK2_DEPENDENCIES = pkgconfig libglib2 cairo pango atk
+LIBGTK2_DEPENDENCIES = host-pkgconfig libglib2 cairo pango atk
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LIBGTK2_CONF_OPT += --with-gdktarget=directfb
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index e2d73f6600..d656f657c7 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -9,6 +9,6 @@ LIBIDN_SITE = http://ftp.gnu.org/gnu/libidn/
LIBIDN_INSTALL_STAGING = YES
LIBIDN_INSTALL_TARGET = YES
LIBIDN_CONF_OPT = --enable-shared
-LIBIDN_DEPENDENCIES = uclibc pkgconfig gettext $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_DEPENDENCIES = uclibc host-pkgconfig gettext $(if $(BR2_PACKAGE_LIBICONV),libiconv)
$(eval $(call AUTOTARGETS,package,libidn))
diff --git a/package/libpng/Config.in b/package/libpng/Config.in
index 6fa533f508..b0a3646078 100644
--- a/package/libpng/Config.in
+++ b/package/libpng/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBPNG
bool "libpng"
select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_PKGCONFIG
help
Library for handling PNG (Portable Network Graphics)
images.
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 8c002749db..8ed1b1a219 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -16,7 +16,7 @@ LIBPNG_CONF_ENV = \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes
LIBPNG_CONF_OPT = --without-libpng-compat
-LIBPNG_DEPENDENCIES = uclibc pkgconfig zlib
+LIBPNG_DEPENDENCIES = uclibc host-pkgconfig zlib
$(eval $(call AUTOTARGETS,package,libpng))
diff --git a/package/libusb/Config.in b/package/libusb/Config.in
index 20f2556c70..7f7276fed8 100644
--- a/package/libusb/Config.in
+++ b/package/libusb/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBUSB
bool "libusb"
- select BR2_PACKAGE_PKGCONFIG
help
Userspace library for accessing USB devices
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 6a80d2671c..bf831daea2 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -58,7 +58,7 @@ $(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/usr/lib/libusb.so
cp -dpf $(STAGING_DIR)/usr/lib/libusb*.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libusb*.so*
-libusb: uclibc pkgconfig $(TARGET_DIR)/$(LIBUSB_BINARY)
+libusb: uclibc host-pkgconfig $(TARGET_DIR)/$(LIBUSB_BINARY)
libusb-clean:
rm -f $(STAGING_DIR)/bin/libusb-config
diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in
index 59ebef175f..c31896617a 100644
--- a/package/libxslt/Config.in
+++ b/package/libxslt/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBXSLT
bool "libxslt"
- select BR2_PACKAGE_PKGCONFIG
help
Install the xslt library which is used
to transform XML files to other XML files.
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index b745175dfb..a5e68f8c99 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_MATCHBOX
bool "MatchBox Window Manager"
select BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXCURSOR
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index e2e4e0ed5a..6dfccf853c 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -604,7 +604,7 @@ $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_B
cp -af $(STAGING_DIR)/usr/share/matchbox/matchbox-keyboard $(TARGET_DIR)/usr/share/matchbox/
cp -dpf ./package/matchbox/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
-matchbox: uclibc pkgconfig expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN)
+matchbox: uclibc host-pkgconfig expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN)
matchbox-panel: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/matchbox-session $(MATCHBOX_PANEL_DEPS)
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 9bc68c8404..eb960d4eb4 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_MIDORI
bool "midori"
select BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_LIBSEXY
- select BR2_PACKAGE_PKGCONFIG
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
help
Midori is a lightweight web browser based on WebKit
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index c3c190eff5..805b0287a7 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -11,6 +11,6 @@ MIDORI_AUTORECONF = YES
MIDORI_INSTALL_STAGING = NO
MIDORI_INSTALL_TARGET = YES
-MIDORI_DEPENDENCIES = uclibc pkgconfig webkit libsexy $(XSERVER)
+MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy $(XSERVER)
$(eval $(call AUTOTARGETS,package,midori))
diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 37e1427cf1..213d650103 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GSTREAMER
bool "gstreamer"
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBXML2
- select BR2_PACKAGE_PKGCONFIG
help
GStreamer is an open source multimedia framework.
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index fb9a3b9109..4c17d4e7e2 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -23,6 +23,6 @@ GSTREAMER_CONF_OPT = \
--disable-tests \
--disable-failing-tests
-GSTREAMER_DEPENDENCIES = libglib2 libxml2 pkgconfig
+GSTREAMER_DEPENDENCIES = libglib2 libxml2 host-pkgconfig
$(eval $(call AUTOTARGETS,package/multimedia,gstreamer))
diff --git a/package/multimedia/libmpd/Config.in b/package/multimedia/libmpd/Config.in
index 72630ad270..c79203c99f 100644
--- a/package/multimedia/libmpd/Config.in
+++ b/package/multimedia/libmpd/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBMPD
select BR2_PACKAGE_GETTEXT
select BR2_PACKAGE_LIBINTL
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
- select BR2_PACKAGE_PKGCONFIG
help
High-level client library for accessing Music Player Daemon.
LibMpd is a library that provides high-level, callback-based
diff --git a/package/multimedia/libogg/Config.in b/package/multimedia/libogg/Config.in
index bbaf087975..effe74fb34 100644
--- a/package/multimedia/libogg/Config.in
+++ b/package/multimedia/libogg/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBOGG
bool "libogg"
- select BR2_PACKAGE_PKGCONFIG
help
Ogg is the name of Xiph.org's container format for audio,
video, and metadata
diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk
index 8ea08353b3..c76c9323ad 100644
--- a/package/multimedia/libogg/libogg.mk
+++ b/package/multimedia/libogg/libogg.mk
@@ -10,6 +10,6 @@ LIBOGG_AUTORECONF = NO
LIBOGG_INSTALL_STAGING = YES
LIBOGG_INSTALL_TARGET = YES
-LIBOGG_DEPENDENCIES = uclibc pkgconfig
+LIBOGG_DEPENDENCIES = uclibc host-pkgconfig
$(eval $(call AUTOTARGETS,package/multimedia,libogg))
diff --git a/package/multimedia/libtheora/Config.in b/package/multimedia/libtheora/Config.in
index 97a70870f5..bf20a50372 100644
--- a/package/multimedia/libtheora/Config.in
+++ b/package/multimedia/libtheora/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBTHEORA
bool "libtheora"
select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_LIBVORBIS
- select BR2_PACKAGE_PKGCONFIG
help
A library for the free and open video compression format "Theora"
from the Xiph.org Foundation.
diff --git a/package/multimedia/libtheora/libtheora.mk b/package/multimedia/libtheora/libtheora.mk
index 1d311d204b..d6a9b2a9d2 100644
--- a/package/multimedia/libtheora/libtheora.mk
+++ b/package/multimedia/libtheora/libtheora.mk
@@ -14,6 +14,6 @@ LIBTHEORA_CONF_OPT = \
--disable-sdltest \
--disable-examples
-LIBTHEORA_DEPENDENCIES = libogg libvorbis pkgconfig
+LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkgconfig
$(eval $(call AUTOTARGETS,package/multimedia,libtheora))
diff --git a/package/multimedia/libvorbis/Config.in b/package/multimedia/libvorbis/Config.in
index 929713e765..28a6a2ea00 100644
--- a/package/multimedia/libvorbis/Config.in
+++ b/package/multimedia/libvorbis/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBVORBIS
bool "libvorbis"
select BR2_PACKAGE_LIBOGG
- select BR2_PACKAGE_PKGCONFIG
help
Library for the Vorbis open source audio decoder
Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk
index 74a9b086fe..bda141efaa 100644
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
@@ -13,7 +13,7 @@ LIBVORBIS_INSTALL_TARGET = YES
LIBVORBIS_CONF_OPT = --disable-oggtest
-LIBVORBIS_DEPENDENCIES = uclibc pkgconfig libogg
+LIBVORBIS_DEPENDENCIES = uclibc host-pkgconfig libogg
$(eval $(call AUTOTARGETS,package/multimedia,libvorbis))
@@ -76,7 +76,7 @@ $(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so
cp -dpf $(TREMOR_DIR)/lib/tremor.a $(TARGET_DIR)/usr/lib/
touch $@
-tremor: uclibc pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so
+tremor: uclibc host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so
tremor-source: $(DL_DIR)/$(TREMOR_SOURCE)
diff --git a/package/neon/Config.in b/package/neon/Config.in
index 29af073b78..ce72a2fb6c 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_NEON
bool "libneon"
- select BR2_PACKAGE_PKGCONFIG
help
HTTP and WebDAV client library, with a C interface.
diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index da2c86a0d6..6fbf8e5e8a 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -3,7 +3,6 @@ comment "ntfs-3g has no inherent support for AVR32"
config BR2_PACKAGE_NTFS-3G
bool "ntfs-3g"
- select BR2_PACKAGE_PKGCONFIG
help
The NTFS-3G driver is an open source, freely available
read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD,
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 1e78feeccf..b8d299a643 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -63,7 +63,7 @@ $(TARGET_DIR)/usr/bin/ntfs-3g: $(STAGING_DIR)/usr/bin/ntfs-3g
cp -dpf $(STAGING_DIR)/bin/ntfs-3g $(TARGET_DIR)/bin/
touch -c $@
-ntfs-3g: uclibc pkgconfig libfuse $(TARGET_DIR)/usr/bin/ntfs-3g
+ntfs-3g: uclibc host-pkgconfig libfuse $(TARGET_DIR)/usr/bin/ntfs-3g
ntfs-3g-source: $(DL_DIR)/$(NTFS-3G_SOURCE)
diff --git a/package/pango/Config.in b/package/pango/Config.in
index 91d1f0dcc2..bf2fc6e709 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_PANGO
bool "pango"
- select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_CAIRO
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index d93922e651..4a236d3202 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -52,7 +52,7 @@ PANGO_CONF_OPT = --enable-shared --enable-static \
$(PANGO_CONF_OPT_X) \
--enable-explicit-deps=no --disable-debug
-PANGO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 $(XSERVER) cairo
+PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 $(XSERVER) cairo
$(eval $(call AUTOTARGETS,package,pango))
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index b63b3a9f06..c7ad88720b 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_PCMANFM
bool "pcmanfm"
- select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_GAMIN
select BR2_PACKAGE_STARTUP_NOTIFICATION
select BR2_PACKAGE_LIBGTK2
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 0c73c48fd7..4c8b595181 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -12,7 +12,7 @@ PCMANFM_INSTALL_TARGET = YES
PCMANFM_CONF_OPT = --disable-hal
-PCMANFM_DEPENDENCIES = uclibc pkgconfig libgtk2 gamin startup-notification
+PCMANFM_DEPENDENCIES = uclibc host-pkgconfig libgtk2 gamin startup-notification
$(eval $(call AUTOTARGETS,package,pcmanfm))
diff --git a/package/pkgconfig/Config.in b/package/pkgconfig/Config.in
index 2e6ac7db12..cd2852df6e 100644
--- a/package/pkgconfig/Config.in
+++ b/package/pkgconfig/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PKGCONFIG
bool "pkg-config"
+ select BR2_PACKAGE_LIBGLIB2
help
pkg-config is a system for managing library compile/link
flags that works with automake and autoconf. It replaces
diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk
index 22ce1c7992..00fd9582c1 100644
--- a/package/pkgconfig/pkgconfig.mk
+++ b/package/pkgconfig/pkgconfig.mk
@@ -3,18 +3,23 @@
# pkgconfig
#
#############################################################
-PKGCONFIG_VERSION:=0.23
-PKGCONFIG_SOURCE:=pkg-config-$(PKGCONFIG_VERSION).tar.gz
-PKGCONFIG_SITE:=http://pkgconfig.freedesktop.org/releases/
+PKGCONFIG_VERSION = 0.23
+PKGCONFIG_SOURCE = pkg-config-$(PKGCONFIG_VERSION).tar.gz
+PKGCONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
-# pkgconfig for the host
-PKGCONFIG_HOST_DIR:=$(BUILD_DIR)/pkg-config-$(PKGCONFIG_VERSION)-host
-PKGCONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
+ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
+PKGCONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
+endif
+
+PKGCONFIG_DEPENDENCIES = uclibc libglib2
-$(DL_DIR)/$(PKGCONFIG_SOURCE):
- $(call DOWNLOAD,$(PKGCONFIG_SITE),$(PKGCONFIG_SOURCE))
+PKGCONFIG_CONF_OPT = --with-installed-glib
-pkgconfig-source: $(DL_DIR)/$(PKGCONFIG_SOURCE)
+$(eval $(call AUTOTARGETS,package,pkgconfig))
+
+# pkgconfig for the host
+PKGCONFIG_HOST_DIR:=$(BUILD_DIR)/pkgconfig-$(PKGCONFIG_VERSION)-host
+PKGCONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
$(PKGCONFIG_HOST_DIR)/.unpacked: $(DL_DIR)/$(PKGCONFIG_SOURCE)
mkdir -p $(@D)
@@ -39,21 +44,12 @@ $(PKGCONFIG_HOST_DIR)/.compiled: $(PKGCONFIG_HOST_DIR)/.configured
$(PKGCONFIG_HOST_BINARY): $(PKGCONFIG_HOST_DIR)/.compiled
$(MAKE) -C $(<D) install
-host-pkgconfig pkgconfig: $(PKGCONFIG_HOST_BINARY)
+host-pkgconfig: $(PKGCONFIG_HOST_BINARY)
-host-pkgconfig-clean pkgconfig-clean:
+host-pkgconfig-clean:
rm -f $(addprefix $(PKGCONFIG_HOST_DIR)/,.unpacked .configured .compiled)
-$(MAKE) -C $(PKGCONFIG_HOST_DIR) uninstall
-$(MAKE) -C $(PKGCONFIG_HOST_DIR) clean
-host-pkgconfig-dirclean pkgconfig-dirclean:
+host-pkgconfig-dirclean:
rm -rf $(PKGCONFIG_HOST_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_PKGCONFIG),y)
-TARGETS+=pkgconfig
-endif
diff --git a/package/sylpheed/Config.in b/package/sylpheed/Config.in
index 7f90f90c6a..2c4aa3a451 100644
--- a/package/sylpheed/Config.in
+++ b/package/sylpheed/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_SYLPHEED
bool "sylpheed"
- select BR2_PACKAGE_PKGCONFIG
help
lightweight and user-friendly e-mail client.
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 150ba0482c..c4cb53d778 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -13,7 +13,7 @@ SYLPHEED_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix=""
-SYLPHEED_DEPENDENCIES = uclibc pkgconfig
+SYLPHEED_DEPENDENCIES = uclibc host-pkgconfig
$(eval $(call AUTOTARGETS,package,sylpheed))
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index fcca73b5b9..38e17482ca 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -15,7 +15,7 @@ TIFF_CONF_OPT = \
--disable-cxx \
--without-x \
-TIFF_DEPENDENCIES = uclibc pkgconfig zlib jpeg
+TIFF_DEPENDENCIES = uclibc host-pkgconfig zlib jpeg
$(eval $(call AUTOTARGETS,package,tiff))
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 05e61642bc..0720e3fac0 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -5,7 +5,6 @@ select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_FONTCONFIG
-select BR2_PACKAGE_PKGCONFIG
help
Support for X11R7 libraries, servers, drivers, and/or
applications in the target.
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index addc0b6b28..8d13568a57 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -59,7 +59,7 @@ $(XFONT_FONT_UTIL_DIR)/.hacked: $(XFONT_FONT_UTIL_DIR)/.installed
( package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) )
touch $@
-xfont_font-util: uclibc pkgconfig $(XFONT_FONT_UTIL_DIR)/.hacked
+xfont_font-util: uclibc host-pkgconfig $(XFONT_FONT_UTIL_DIR)/.hacked
xfont_font-util-unpacked: $(XFONT_FONT_UTIL_DIR)/.unpacked