]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
packages: fix pkgconfig depencies and select pkgconfig where needed
authorPeter Korsgaard <jacmet@sunsite.dk>
Sat, 14 Jun 2008 21:01:16 +0000 (21:01 -0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 14 Jun 2008 21:01:16 +0000 (21:01 -0000)
34 files changed:
package/dbus-glib/Config.in
package/dbus/Config.in
package/dbus/dbus.mk
package/editors/vim/Config.in
package/editors/vim/vim.mk
package/expat/Config.in
package/freetype/Config.in
package/gettext/Config.in
package/gqview/Config.in
package/gqview/gqview.mk
package/hal/Config.in
package/hal/hal.mk
package/java/classpath/Config.in
package/java/classpath/classpath.mk
package/java/jamvm/Config.in
package/java/jamvm/jamvm.mk
package/libdaemon/Config.in
package/libdrm/Config.in
package/libgtk2/Config.in
package/libgtk2/libgtk2.mk
package/libogg/Config.in
package/libpng/Config.in
package/libusb/Config.in
package/libusb/libusb.mk
package/libvorbis/Config.in
package/matchbox/Config.in
package/matchbox/matchbox.mk
package/midori/Config.in
package/midori/midori.mk
package/ntfs-3g/Config.in
package/pcmanfm/Config.in
package/pcmanfm/pcmanfm.mk
package/sylpheed/Config.in
package/sylpheed/sylpheed.mk

index 285687a60d8257fb48141d593ddf9f8ec84fbf63..7237b0fcdb3f221fc6ed49682e1fe4702a30ae82 100644 (file)
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DBUS_GLIB
        default n
        depends on BR2_PACKAGE_DBUS
        select BR2_PACKAGE_LIBGLIB2
+       select BR2_PACKAGE_PKGCONFIG
        help
          GLib bindings for D-Bus.
 
index 973ba07f9ef3d71ecbcebc84f8f2729e24aecb56..343656c350ea2f3f844187508d78e4d5a89222af 100644 (file)
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DBUS
        bool "dbus"
        default n
        depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2
+       select BR2_PACKAGE_PKGCONFIG
        help
          The D-Bus message bus system.
 
index 4687a48097df1474c1efea29c6f7a8e04b5af6a6..8a22403bdfd2d56496a3ffc15559d7a467a6acaf 100644 (file)
@@ -83,7 +83,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y)
        rm -rf $(TARGET_DIR)/usr/share/man
 endif
 
-dbus: uclibc $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
 
 dbus-clean:
        rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
index 5d912fc92425b2a57b8ed809a3b145b92fe99da5..ddf0a604f56c758e291db81cc1990eb823423143 100644 (file)
@@ -2,6 +2,7 @@ config BR2_PACKAGE_VIM
        bool "vim"
        default n
        select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_PKGCONFIG
        help
          VIM Text editor
 
index 2dbf218ee19d7161922168c6442551a2fc84bc87..5815b2b570a4f4c916d5ae4d0aa9cf79c051e50a 100644 (file)
@@ -86,7 +86,7 @@ ifeq ($(R2_PACKAGE_VIM_RUNTIME),y)
        )
 endif
 
-vim: ncurses vim-source $(TARGET_DIR)/usr/bin/vim
+vim: uclibc pkgconfig ncurses vim-source $(TARGET_DIR)/usr/bin/vim
 
 #############################################################
 #
index 6d44a8ab22188250c414b2e1546f183e48538495..cd07a96e7512b5df4d4655fd2c08866b849a506b 100644 (file)
@@ -3,6 +3,7 @@
 config BR2_PACKAGE_EXPAT
        bool"expat"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
          The Expat XML Parser.
 
index 4f08b97b878f77f81f1c5cfc588ce15fb28a6a9b..7159a072772270fec217e5642d623e46ad21f419 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_FREETYPE
        bool "freetype"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
        a free, high-quality and portable font engine.
 
index 34d431bb82dfc9aec7d8155bbe8d0d6b5b626e9d..22686a5d91ea5501ebbd24816adfd389bc5036a1 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GETTEXT
        bool "gettext"
        default n
+       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
index fbbb21f71094c0f0e711e01f53466f351b655492..66721f41500d31aa22b57944e8a0454f72fe01b1 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GQVIEW
        bool "gqview"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
          GQview is an image viewer for Unix operating systems (developed on Linux).
 
index bc600d7bc8aa2b6f6beeab00be1561ad283dbd2a..4bfb9a0bc1d55dc4cb5ac366436049fa5123f794 100644 (file)
@@ -12,7 +12,7 @@ GQVIEW_INSTALL_TARGET = YES
 
 GQVIEW_CONF_OPT = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
 
-GQVIEW_DEPENDENCIES = uclibc libgtk2
+GQVIEW_DEPENDENCIES = uclibc pkgconfig libgtk2
 
 $(eval $(call AUTOTARGETS,package,gqview))
 
index 52740fcbc13a0736e9ec918b64ad2d72cfcb8f31..5de63f5f467cea8d0e1c44cb16363d6f7be2a134 100644 (file)
@@ -5,5 +5,6 @@ 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.
index f7f5d114dd47061f9d3b04b3f030930051a78eb5..27a5cd65bf37d76c47261e7a00ee4feacfbdfbfa 100644 (file)
@@ -89,7 +89,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
        done
        -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal*
 
-hal: uclibc dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY)
+hal: uclibc 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
index efd6e0b7f4490837df2ea53c3e85263499608260..15ea83360cad8a6b28d14b81c213615dfeaee7a2 100644 (file)
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CLASSPATH
        bool "classpath"
+       select BR2_PACKAGE_PKGCONFIG
        default n
 
        help
index cd9cc3565f50323a025623a146983bfe79e5b4ee..0e0eaa3da60d8e53770116afb6b03578dc377669 100644 (file)
@@ -58,7 +58,7 @@ CLASSPATH_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
                --disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                --disable-gconf-peer --disable-examples --disable-plugin
 
-CLASSPATH_DEPENDENCIES = uclibc png jpeg tiff
+CLASSPATH_DEPENDENCIES = uclibc pkgconfig png jpeg tiff
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
        CLASSPATH_DEPENDENCIES+= alsa-lib
index 53673c9e6fe5545f9bc5266efd91d6032e7c42e8..2f2ddd787b463433758558213249e3da049fe9eb 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_JAMVM
        bool "jamvm"
        default n
         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). 
index 0cb015760b61d558051909313163dc7902e87b11..951d091d8b97f8ec2ee6bc84b9312a640c714ed3 100644 (file)
@@ -57,7 +57,7 @@ JAMVM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
                --with-classpath-install-dir=/usr \
 
 
-JAMVM_DEPENDENCIES = uclibc classpath
+JAMVM_DEPENDENCIES = uclibc pkgconfig classpath
 
 #Include X libraries when we have an X server
 ifneq ($(BR2_PACKAGE_XSERVER_none),y)
index b34f982f8c954d984882d77f00ff89aa2a3a39a5..82a1e3726dd64f1e1fbf2ff4d2d738ffa39abcb8 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBDAEMON
        bool "libdaemon"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
          libdaemon is a lightweight C library that eases the 
          writing of UNIX daemons.
index 8a67975ac86caf6658a773c52ca291a59b0f7e2a..5936f05a292efb97eb9b4a5b2e34694067d84d59 100644 (file)
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_LIBDRM
        bool "libdrm"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
          Direct Rendering Manager
-       
+
          http://dri.freedesktop.org/libdrm/
index 673bbf04836ddf74c5d8e0c1d83aee26f0eb9fdc..7d63eaebff7fcd6ff3c0166dd4f129a748018a1d 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBGTK2
        bool "libgtk2"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        select BR2_PACKAGE_ATK
        select BR2_PACKAGE_PANGO
        select BR2_PACKAGE_CAIRO
index 4fc46d3e3b2834421bd35633ed4e52a6baada3b6..88de74ddeda8810b80e624230a17d238e56a7da6 100644 (file)
@@ -74,6 +74,6 @@ else
        LIBGTK2_CONF_OPT += --without-x
 endif
 
-LIBGTK2_DEPENDENCIES = uclibc png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk 
+LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk
 
 $(eval $(call AUTOTARGETS,package,libgtk2))
index 09c56895c3ee5e055a5f326ca6a521bd1bed7110..bf5f5084730c32ab479803293e770b63f42d6e59 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBOGG
        bool "libogg"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
          Ogg is the name of Xiph.org's container format for audio, video, and metadata
 
index dcc22c92fdf399e7027352eca9c2b975f0ba73c5..c5f7c13a063384e4e25feaf70cc841e90640cf67 100644 (file)
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBPNG
        bool "libpng"
        default n
        select BR2_PACKAGE_ZLIB
+       select BR2_PACKAGE_PKGCONFIG
        help
          Library for handling PNG (Portable Network Graphics)
          images.
index 44a2018c7a0915bdd8487066b4593766dd3d8a24..f53f2a3a20fbf1e7834612889e99f6261d8f772b 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBUSB
        bool "libusb"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
          Userspace library for accessing USB devices
 
index adb8b9232566c2bdfaa89b1a393f7f58a0bce691..041856232d2428e781e512920596d5b7f6c2f6d8 100644 (file)
@@ -59,7 +59,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 $(TARGET_DIR)/$(LIBUSB_BINARY)
+libusb: uclibc pkgconfig $(TARGET_DIR)/$(LIBUSB_BINARY)
 
 libusb-clean:
        rm -f $(STAGING_DIR)/bin/libusb-config
index 67deded69691abf87ffe92f3a595addebe24a56a..9d63026b1ddbb7e7f13f142ea04d1737d204b608 100644 (file)
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBVORBIS
        bool "libvorbis"
        default n
        depends on 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,
index fb56fda06d4937ef59aa9effc415a261901e2351..2e79ea74ed6e5b21f707b51e9867ed7c4a012022 100644 (file)
@@ -2,6 +2,7 @@ config BR2_PACKAGE_MATCHBOX
        bool "MatchBox Window Manager"
        default n
        select BR2_PACKAGE_XSERVER_XORG_SERVER
+       select BR2_PACKAGE_PKGCONFIG
        select BR2_PACKAGE_FONTCONFIG
        select BR2_PACKAGE_XLIB_LIBXDAMAGE
        select BR2_PACKAGE_XLIB_LIBXCURSOR
index 71c3c9b530eebad707696b09a89afa0b05f81bad..52829a1fd255b74e33d6093834702a78f45c7743 100644 (file)
@@ -618,7 +618,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 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 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)
 
index 1741f70c8a3db06e2d7c041ef73d192f99274477..9142d103fb6c794f248a645399b3f2066bbed92a 100644 (file)
@@ -2,6 +2,7 @@ config BR2_PACKAGE_MIDORI
        bool "midori"
        select BR2_PACKAGE_WEBKIT
        select BR2_PACKAGE_LIBSEXY
+       select BR2_PACKAGE_PKGCONFIG
        default n
        depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
        help
index 6e81effa66f903c785c7c8932ebb12cf7786b71e..9db65cf5cbfed75240dbb8027ed5a01bba8e26e7 100644 (file)
@@ -13,9 +13,9 @@ MIDORI_INSTALL_TARGET = YES
 
 MIDORI_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME)  --prefix=/usr --sysconfdir=/etc \
-               PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig 
+               PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
 
 
-MIDORI_DEPENDENCIES = uclibc webkit libsexy $(XSERVER) 
+MIDORI_DEPENDENCIES = uclibc pkgconfig webkit libsexy $(XSERVER)
 
 $(eval $(call AUTOTARGETS,package,midori))
index 5cf006ce4668504718999635fec87e2fcdefba8c..92b0da6aa09b0d204202966202bd24eab2aa0e22 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NTFS-3G
         bool "ntfs-3g"
         default n
+       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, and Haiku. It provides safe and fast handling of the Windows XP, Windows Server 2003, Windows 2000 and Windows Vista file systems. Most POSIX file system operations are supported, with the exception of full file ownership and access right support.
 
index e7fe0c0d5c99ffcd28395f770a27042191572122..3e105b390192e188045d155fda6d5cc5530e5d89 100644 (file)
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PCMANFM
        bool "pcmanfm"
+       select BR2_PACKAGE_PKGCONFIG
        select BR2_PACKAGE_GAMIN
        select BR2_PACKAGE_STARTUP_NOTIFICATION
        select BR2_PACKAGE_LIBGTK2
index 99ad30c226261bba0ab393e6802b29ce49a9c3a0..eb816d9fece43729672d1cf2fcb6565f7ad644af 100644 (file)
@@ -13,7 +13,7 @@ PCMANFM_INSTALL_TARGET = YES
 PCMANFM_CONF_ENV = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
 PCMANFM_CONF_OPT = --disable-hal
 
-PCMANFM_DEPENDENCIES = uclibc libgtk2 gamin startup-notification
+PCMANFM_DEPENDENCIES = uclibc pkgconfig libgtk2 gamin startup-notification
 
 $(eval $(call AUTOTARGETS,package,pcmanfm))
 
index 588e139d639e014899e3b2ec28166062e5384e82..7b5d22cf4daeb6615a29464e5acc91c398994995 100644 (file)
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SYLPHEED
        bool "sylpheed"
        default n
+       select BR2_PACKAGE_PKGCONFIG
        help
          lightweight and user-friendly e-mail client.
 
index b88ebc783d68fb10e66fd36b56d0be5eaea7c34c..76117805d777f38273ccbfc66eacc67d53c40a18 100644 (file)
@@ -14,7 +14,7 @@ SYLPHEED_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 SYLPHEED_CONF_ENV = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
 SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix=""
 
-SYLPHEED_DEPENDENCIES = uclibc 
+SYLPHEED_DEPENDENCIES = uclibc pkgconfig
 
 $(eval $(call AUTOTARGETS,package,sylpheed))