diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-18 19:19:10 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-18 19:19:10 +0000 |
| commit | 77754571b2f327636ce0072cfabc9ce0c9a6ad86 (patch) | |
| tree | 56fc2d3552653caaa20ee7577b1a04375f80bf28 | |
| parent | 344d59d788d697f4f6704dd920cad615318e47be (diff) | |
| download | buildroot-novena-77754571b2f327636ce0072cfabc9ce0c9a6ad86.tar.gz buildroot-novena-77754571b2f327636ce0072cfabc9ce0c9a6ad86.zip | |
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.
100 files changed, 53 insertions, 120 deletions
diff --git a/docs/buildroot.html b/docs/buildroot.html index a13945969..454ddaee9 100644 --- a/docs/buildroot.html +++ b/docs/buildroot.html @@ -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> diff --git a/package/atk/Config.in b/package/atk/Config.in index f793d762a..e7f75b391 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 ac6f5059d..b75691431 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 bd2845b3c..e19efb5c4 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 668f915c6..c1f80d7b1 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 9779da7e8..52c7e7ca4 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 d19acdf83..f0fc017cb 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 9343d8c2c..9b800d5e5 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 4c047012c..02ad624f3 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 b424c29c5..1c89a79c8 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 fb4c4ecda..d86e88b3b 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 1ffc53da8..30b73d305 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 b0f0d059a..d84e7c029 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 f82700a01..4a437abe8 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 b8624b772..4028a8f08 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 aa5298b94..ba87aff41 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 2dfd9d388..39ce0166f 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 84784acb3..bd5950c12 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 2a0c33305..c6e017849 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 a3e275c95..a8343617e 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 9922df46a..6d06258c6 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 cb3dfb2ad..8d769209c 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 37dc9100d..56ed42854 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 3ea77587d..5042509e1 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 33837636d..c6b5e5280 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 367b3d802..faa634143 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 6e166dc42..59ac593aa 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 560be3470..dff089af4 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 2c5c049fa..69432630d 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 abc1556cb..b38861a82 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 9680ee351..3d8a731be 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 672c148a0..d3636e643 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 efed36bf7..2fb6eb60a 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 9b5aa30c0..786306173 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 191370136..30f47dd85 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 50dc06816..6b4aa8811 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 85d4a4951..19809f26e 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 234e0db0e..a259fff4a 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 e2d73f660..d656f657c 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 6fa533f50..b0a364607 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 8c002749d..8ed1b1a21 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 20f2556c7..7f7276fed 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 6a80d2671..bf831daea 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 59ebef175..c31896617 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 b745175df..a5e68f8c9 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 e2e4e0ed5..6dfccf853 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 9bc68c840..eb960d4eb 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 c3c190eff..805b0287a 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 37e1427cf..213d65010 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 fb9a3b910..4c17d4e7e 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 72630ad27..c79203c99 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 bbaf08797..effe74fb3 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 8ea08353b..c76c9323a 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 97a70870f..bf20a5037 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 1d311d204..d6a9b2a9d 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 929713e76..28a6a2ea0 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 74a9b086f..bda141efa 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 29af073b7..ce72a2fb6 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 da2c86a0d..6fbf8e5e8 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 1e78feecc..b8d299a64 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 91d1f0dcc..bf2fc6e70 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 d93922e65..4a236d320 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 b63b3a9f0..c7ad88720 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 0c73c48fd..4c8b59518 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 2e6ac7db1..cd2852df6 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 22ce1c799..00fd9582c 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 7f90f90c6..2c4aa3a45 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 150ba0482..c4cb53d77 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 fcca73b5b..38e17482c 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 05e61642b..0720e3fac 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 addc0b6b2..8d13568a5 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 diff --git a/scripts/test/Config.in.test.buildall b/scripts/test/Config.in.test.buildall index 5baafb5d6..7183963dd 100644 --- a/scripts/test/Config.in.test.buildall +++ b/scripts/test/Config.in.test.buildall @@ -44,7 +44,6 @@ config BR2_TARGET_TEST_PACKAGES select BR2_PACKAGE_M4 select BR2_PACKAGE_MPATROL select BR2_PACKAGE_OPROFILE - select BR2_PACKAGE_PKGCONFIG select BR2_PACKAGE_READLINE select BR2_PACKAGE_READLINE_TARGET select BR2_PACKAGE_READLINE_HEADERS diff --git a/target/device/ARMLTD/integrator926/integrator926_defconfig b/target/device/ARMLTD/integrator926/integrator926_defconfig index f7ddb08d3..6148759f5 100644 --- a/target/device/ARMLTD/integrator926/integrator926_defconfig +++ b/target/device/ARMLTD/integrator926/integrator926_defconfig @@ -305,7 +305,6 @@ BR2_HOST_FAKEROOT=y # # oprofile requires a toolchain with C++ support enabled # -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig b/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig index dba14ad73..d18105b0d 100644 --- a/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig +++ b/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig @@ -310,7 +310,6 @@ BR2_PACKAGE_LIBTOOL=y BR2_PACKAGE_M4=y # BR2_PACKAGE_MPATROL is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y BR2_PACKAGE_READLINE_TARGET=y # BR2_PACKAGE_READLINE_HEADERS is not set diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig index 661ff51dc..f372d94ba 100644 --- a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig +++ b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig @@ -374,7 +374,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig b/target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig index 93080aba1..457d69b07 100644 --- a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig +++ b/target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig @@ -272,7 +272,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe" # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig b/target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig index 93e1d6c9e..ae6cb14f5 100644 --- a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig +++ b/target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig @@ -299,7 +299,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig b/target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig index 5c7f39543..bc1a4a927 100644 --- a/target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig +++ b/target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig @@ -352,7 +352,6 @@ BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig index 312a346d7..38e240218 100644 --- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig +++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig @@ -386,7 +386,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y BR2_PACKAGE_READLINE_TARGET=y # BR2_PACKAGE_READLINE_HEADERS is not set diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig index ac7cfd3f8..37196a397 100644 --- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig +++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig @@ -272,7 +272,6 @@ BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux" # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig index a6fe3c4da..0ae3fbd52 100644 --- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig +++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig @@ -307,7 +307,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig b/target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig index 7b3a250d2..7d0586b84 100644 --- a/target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig +++ b/target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig @@ -283,7 +283,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBMPFR is not set BR2_PACKAGE_LIBTOOL=y BR2_PACKAGE_M4=y -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y BR2_PACKAGE_READLINE_TARGET=y # BR2_PACKAGE_XERCES is not set diff --git a/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig b/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig index 485249bc8..31af7986f 100644 --- a/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig +++ b/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig @@ -380,7 +380,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y BR2_PACKAGE_READLINE_TARGET=y # BR2_PACKAGE_READLINE_HEADERS is not set diff --git a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig b/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig index a837600fe..42519adf7 100644 --- a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig +++ b/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig @@ -275,7 +275,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe" # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig b/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig index 7a6c8f2f6..37e642652 100644 --- a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig +++ b/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig @@ -338,7 +338,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig b/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig index 5011319d7..c5cc5ef77 100644 --- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig +++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig @@ -379,7 +379,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig b/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig index b9b2a2012..988c7dfba 100644 --- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig +++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig @@ -274,7 +274,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe" # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig b/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig index a1e7b1249..10fabcb9e 100644 --- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig +++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig @@ -300,7 +300,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig index 08902d558..3c358be33 100644 --- a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig +++ b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig @@ -379,7 +379,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig index 913e1a815..d2eb609f5 100644 --- a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig +++ b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig @@ -272,7 +272,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe" # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig index 7772b8d10..41cb61336 100644 --- a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig +++ b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig @@ -307,7 +307,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/atngw100-base/atngw100-base_defconfig b/target/device/Atmel/atngw100-base/atngw100-base_defconfig index cb231ca7b..f908cbce3 100644 --- a/target/device/Atmel/atngw100-base/atngw100-base_defconfig +++ b/target/device/Atmel/atngw100-base/atngw100-base_defconfig @@ -325,7 +325,6 @@ BR2_HOST_FAKEROOT=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig b/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig index 0f30ad42a..66728c043 100644 --- a/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig +++ b/target/device/Atmel/atngw100-expanded/atngw100-expanded_defconfig @@ -335,7 +335,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y BR2_PACKAGE_READLINE=y # BR2_PACKAGE_READLINE_TARGET is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/atngw100/atngw100_defconfig b/target/device/Atmel/atngw100/atngw100_defconfig index 62b1b235d..43dd27f8a 100644 --- a/target/device/Atmel/atngw100/atngw100_defconfig +++ b/target/device/Atmel/atngw100/atngw100_defconfig @@ -326,7 +326,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/atstk1005/atstk1005_defconfig b/target/device/Atmel/atstk1005/atstk1005_defconfig index 4a71ad803..09d44dd80 100644 --- a/target/device/Atmel/atstk1005/atstk1005_defconfig +++ b/target/device/Atmel/atstk1005/atstk1005_defconfig @@ -326,7 +326,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/Atmel/atstk100x/atstk100x_defconfig b/target/device/Atmel/atstk100x/atstk100x_defconfig index 29333928c..41baf6e78 100644 --- a/target/device/Atmel/atstk100x/atstk100x_defconfig +++ b/target/device/Atmel/atstk100x/atstk100x_defconfig @@ -336,7 +336,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/KwikByte/kb9202/kb9202_defconfig b/target/device/KwikByte/kb9202/kb9202_defconfig index d90f41542..2c852eb84 100644 --- a/target/device/KwikByte/kb9202/kb9202_defconfig +++ b/target/device/KwikByte/kb9202/kb9202_defconfig @@ -301,7 +301,6 @@ BR2_HOST_FAKEROOT=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/valka/v100sc2_defconfig b/target/device/valka/v100sc2_defconfig index c087609db..e7686ddd9 100644 --- a/target/device/valka/v100sc2_defconfig +++ b/target/device/valka/v100sc2_defconfig @@ -298,7 +298,6 @@ BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -BR2_PACKAGE_PKGCONFIG=y # BR2_PACKAGE_READLINE is not set BR2_PACKAGE_PCRE=y # BR2_PACKAGE_TMC is not set diff --git a/target/device/x86/i686/i386_defconfig b/target/device/x86/i686/i386_defconfig index 0808f1271..21d6577e1 100644 --- a/target/device/x86/i686/i386_defconfig +++ b/target/device/x86/i686/i386_defconfig @@ -311,7 +311,6 @@ BR2_HOST_FAKEROOT=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_VALGRIND is not set # BR2_PACKAGE_PCRE is not set diff --git a/target/device/x86/i686/i686_defconfig b/target/device/x86/i686/i686_defconfig index af524458a..8a63ce7e3 100644 --- a/target/device/x86/i686/i686_defconfig +++ b/target/device/x86/i686/i686_defconfig @@ -311,7 +311,6 @@ BR2_HOST_FAKEROOT=y # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_OPROFILE is not set -# BR2_PACKAGE_PKGCONFIG is not set # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_VALGRIND is not set # BR2_PACKAGE_PCRE is not set |