packages: fix pkgconfig depencies and select pkgconfig where needed

2008-06-14 21:01:16 +00:00 · 2008-06-14 21:01:16 +00:00 · 565e05c8a1
commit 565e05c8a1
parent 43f18ea31c
34 changed files with 36 additions and 15 deletions
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@ -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.

--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@ -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.

--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@ -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
--- a/package/editors/vim/Config.in
+++ b/package/editors/vim/Config.in
@ -2,6 +2,7 @@ config BR2_PACKAGE_VIM
 	bool "vim"
 	default n
 	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_PKGCONFIG
 	help
 	  VIM Text editor

--- a/package/editors/vim/vim.mk
+++ b/package/editors/vim/vim.mk
@ -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

 #############################################################
 #
--- a/package/expat/Config.in
+++ b/package/expat/Config.in
@ -3,6 +3,7 @@
 config BR2_PACKAGE_EXPAT
 	bool"expat"
 	default n
+	select BR2_PACKAGE_PKGCONFIG
 	help
 	  The Expat XML Parser.

--- a/package/freetype/Config.in
+++ b/package/freetype/Config.in
@ -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.

--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@ -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
--- a/package/gqview/Config.in
+++ b/package/gqview/Config.in
@ -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).

--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@ -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))

--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@ -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.
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@ -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
--- a/package/java/classpath/Config.in
+++ b/package/java/classpath/Config.in
@ -1,5 +1,6 @@
 config BR2_PACKAGE_CLASSPATH
 	bool "classpath"
+	select BR2_PACKAGE_PKGCONFIG
 	default n

 	help
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@ -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
--- a/package/java/jamvm/Config.in
+++ b/package/java/jamvm/Config.in
@ -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). 
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@ -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)
--- a/package/libdaemon/Config.in
+++ b/package/libdaemon/Config.in
@ -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.
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@ -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/
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@ -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
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@ -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))
--- a/package/libogg/Config.in
+++ b/package/libogg/Config.in
@ -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

--- a/package/libpng/Config.in
+++ b/package/libpng/Config.in
@ -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.
--- a/package/libusb/Config.in
+++ b/package/libusb/Config.in
@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBUSB
 	bool "libusb"
 	default n
+	select BR2_PACKAGE_PKGCONFIG
 	help
 	  Userspace library for accessing USB devices

--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@ -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
--- a/package/libvorbis/Config.in
+++ b/package/libvorbis/Config.in
@ -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,
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@ -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
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@ -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)

--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@ -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
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@ -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))
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@ -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.

--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@ -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
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@ -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))

--- a/package/sylpheed/Config.in
+++ b/package/sylpheed/Config.in
@ -1,6 +1,7 @@
 config BR2_PACKAGE_SYLPHEED
 	bool "sylpheed"
 	default n
+	select BR2_PACKAGE_PKGCONFIG
 	help
 	  lightweight and user-friendly e-mail client.

--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@ -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))