* [Buildroot] [PATCHv6 5/5] iw: pkg-config cleanup
From: Gustavo Zacarias @ 2012-10-23 1:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350956875-1726-1-git-send-email-gustavo@zacarias.com.ar>
We no longer need to specify PKG_CONFIG_PATH since it's handled by the
host-pkgconf wrapper.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/iw/iw.mk | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 7633124..651a2ca 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -9,8 +9,7 @@ IW_SOURCE = iw-$(IW_VERSION).tar.bz2
IW_SITE = http://wireless.kernel.org/download/iw
IW_DEPENDENCIES = host-pkgconf libnl
IW_CONFIG = $(IW_DIR)/.config
-IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
- PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
+IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
GIT_DIR=$(IW_DIR)
ifeq ($(BR2_PREFER_STATIC_LIB),y)
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCHv6 4/5] pkg-config: mark as deprecated
From: Gustavo Zacarias @ 2012-10-23 1:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350956875-1726-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/pkg-config/Config.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index eae0a21..7f96d9b 100644
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_PKG_CONFIG
bool "pkg-config"
depends on BR2_USE_WCHAR # glib2
+ depends on BR2_DEPRECATED
select BR2_PACKAGE_LIBGLIB2
help
pkg-config is a system for managing library compile/link
@@ -11,4 +12,4 @@ config BR2_PACKAGE_PKG_CONFIG
http://www.freedesktop.org/software/pkgconfig/
comment "pkg-config requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on BR2_DEPRECATED && !BR2_USE_WCHAR
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCHv6 3/5] pkg-config: remove host variant
From: Gustavo Zacarias @ 2012-10-23 1:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350956875-1726-1-git-send-email-gustavo@zacarias.com.ar>
Remove host-pkg-config in favour of host-pkgconf.
Also remove the sysroot support patch since it's only intended for the
host variant.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
.../pkg-config-0.25-add-with-sysroot.patch | 78 --------------------
package/pkg-config/pkg-config.mk | 14 +---
2 files changed, 1 insertions(+), 91 deletions(-)
delete mode 100644 package/pkg-config/pkg-config-0.25-add-with-sysroot.patch
diff --git a/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch b/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch
deleted file mode 100644
index e8431ed..0000000
--- a/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-[PATCH] Add compiled in default sysroot
-
-Similar to the --with-pc-path option. It works just like the existing
-PKG_CONFIG_SYSROOT_DIR environment variable, but compiled in.
-The environment variable overrides this default setting if set.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile.am | 6 +++++-
- configure.in | 6 ++++++
- main.c | 9 +++++++--
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-Index: pkg-config-0.25/Makefile.am
-===================================================================
---- pkg-config-0.25.orig/Makefile.am
-+++ pkg-config-0.25/Makefile.am
-@@ -28,8 +28,12 @@ EXTRA_DIST = $(m4_DATA) $(man_MANS) READ
- bin_PROGRAMS = pkg-config
- AM_CFLAGS=@WARN_CFLAGS@
-
-+if USE_SYSROOT
-+sysroot_includes = -DPKG_CONFIG_SYSROOT="\"$(sysroot)\""
-+endif
-+
- INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes) \
-- $(popt_includes)
-+ $(popt_includes) $(sysroot_includes)
-
- pkg_config_SOURCES= \
- pkg.h \
-Index: pkg-config-0.25/configure.in
-===================================================================
---- pkg-config-0.25.orig/configure.in
-+++ pkg-config-0.25/configure.in
-@@ -32,6 +32,12 @@ fi
-
- PKG_CONFIG_FIND_PC_PATH
-
-+AC_ARG_WITH(sysroot,
-+ [ --with-sysroot Use sysroot <dir> by default ],
-+ [ sysroot="$withval" ])
-+
-+AC_SUBST([sysroot])
-+AM_CONDITIONAL(USE_SYSROOT, test "x$sysroot" != "x")
- #
- # Code taken from gtk+-2.0's configure.in.
- #
-Index: pkg-config-0.25/main.c
-===================================================================
---- pkg-config-0.25.orig/main.c
-+++ pkg-config-0.25/main.c
-@@ -36,10 +36,14 @@
- #undef STRICT
- #endif
-
-+#ifndef PKG_CONFIG_SYSROOT
-+#define PKG_CONFIG_SYSROOT NULL
-+#endif
-+
- static int want_debug_spew = 0;
- static int want_verbose_errors = 0;
- static int want_stdout_errors = 0;
--char *pcsysrootdir = NULL;
-+char *pcsysrootdir = PKG_CONFIG_SYSROOT;
-
- void
- debug_spew (const char *format, ...)
-@@ -311,7 +315,8 @@ main (int argc, char **argv)
- add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
- }
-
-- pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR");
-+ if (getenv ("PKG_CONFIG_SYSROOT_DIR"))
-+ pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR");
- if (pcsysrootdir)
- {
- define_global_variable ("pc_sysrootdir", pcsysrootdir);
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 7440ac4..6c5e135 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -3,23 +3,11 @@
# pkgconfig
#
#############################################################
+
PKG_CONFIG_VERSION = 0.25
PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz
PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
-
PKG_CONFIG_DEPENDENCIES = libglib2
-
PKG_CONFIG_CONF_OPT = --with-installed-glib
-HOST_PKG_CONFIG_CONF_OPT = \
- --with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig" \
- --with-sysroot="$(STAGING_DIR)" \
- --disable-static
-
-HOST_PKG_CONFIG_AUTORECONF = YES
-HOST_PKG_CONFIG_DEPENDENCIES =
-
$(eval $(autotools-package))
-$(eval $(host-autotools-package))
-
-PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCHv6 2/5] packages: switch to host-pkgconf
From: Gustavo Zacarias @ 2012-10-23 1:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350956875-1726-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/atk/atk.mk | 2 +-
package/avahi/avahi.mk | 2 +-
package/cairo/cairo.mk | 2 +-
package/ccid/ccid.mk | 2 +-
package/collectd/collectd.mk | 2 +-
package/conntrack-tools/conntrack-tools.mk | 2 +-
package/dbus-glib/dbus-glib.mk | 2 +-
package/dbus/dbus.mk | 4 ++--
package/directfb/directfb.mk | 2 +-
package/dnsmasq/dnsmasq.mk | 6 +++---
package/docker/docker.mk | 2 +-
package/e2fsprogs/e2fsprogs.mk | 4 ++--
package/efl/libecore/libecore.mk | 4 ++--
package/efl/libedbus/libedbus.mk | 2 +-
package/efl/libedje/libedje.mk | 2 +-
package/efl/libeet/libeet.mk | 2 +-
package/efl/libeina/libeina.mk | 2 +-
package/efl/libembryo/libembryo.mk | 2 +-
package/efl/libevas/libevas.mk | 4 ++--
package/enchant/enchant.mk | 2 +-
package/evtest/evtest.mk | 2 +-
package/expat/expat.mk | 2 +-
package/freetype/freetype.mk | 4 ++--
package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
package/glib-networking/glib-networking.mk | 2 +-
package/gmpc/gmpc.mk | 2 +-
package/gnutls/gnutls.mk | 2 +-
package/gob2/gob2.mk | 2 +-
package/gpsd/gpsd.mk | 4 ++--
package/gqview/gqview.mk | 2 +-
package/gvfs/gvfs.mk | 2 +-
package/imagemagick/imagemagick.mk | 2 +-
package/imlib2/imlib2.mk | 2 +-
package/ipset/ipset.mk | 2 +-
package/iptables/iptables.mk | 2 +-
package/iw/iw.mk | 2 +-
package/kmod/kmod.mk | 2 +-
package/libao/libao.mk | 2 +-
package/libdaemon/libdaemon.mk | 2 +-
package/libdrm/libdrm.mk | 2 +-
package/libdvdnav/libdvdnav.mk | 2 +-
package/libeXosip2/libeXosip2.mk | 2 +-
package/libexif/libexif.mk | 2 +-
package/libgail/libgail.mk | 2 +-
package/libglade/libglade.mk | 2 +-
package/libglib2/libglib2.mk | 4 ++--
package/libgtk2/libgtk2.mk | 2 +-
package/libidn/libidn.mk | 2 +-
package/libmms/libmms.mk | 2 +-
.../libnetfilter-conntrack.mk | 2 +-
.../libnetfilter-cttimeout.mk | 2 +-
package/libnfc/libnfc.mk | 2 +-
package/liboauth/liboauth.mk | 2 +-
package/libogg/libogg.mk | 2 +-
package/libpng/libpng.mk | 2 +-
package/libsamplerate/libsamplerate.mk | 2 +-
package/libsoup/libsoup.mk | 2 +-
package/libsvgtiny/libsvgtiny.mk | 2 +-
package/libtheora/libtheora.mk | 2 +-
package/libtorrent/libtorrent.mk | 2 +-
package/libusb-compat/libusb-compat.mk | 2 +-
package/libusb/libusb.mk | 2 +-
package/libvncserver/libvncserver.mk | 2 +-
package/libvorbis/libvorbis.mk | 2 +-
package/libxml2/libxml2.mk | 2 +-
package/lighttpd/lighttpd.mk | 2 +-
package/links/links.mk | 2 +-
package/linphone/linphone.mk | 2 +-
package/matchbox/matchbox-lib/matchbox-lib.mk | 2 +-
package/mediastreamer/mediastreamer.mk | 2 +-
package/midori/midori.mk | 2 +-
package/minicom/minicom.mk | 2 +-
.../mobile_broadband_provider_info.mk | 2 +-
package/msmtp/msmtp.mk | 2 +-
package/multimedia/gst-dsp/gst-dsp.mk | 2 +-
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
package/multimedia/gstreamer/gstreamer.mk | 2 +-
package/multimedia/lame/lame.mk | 2 +-
package/multimedia/mpd/mpd.mk | 2 +-
package/multimedia/pulseaudio/pulseaudio.mk | 2 +-
package/neon/neon.mk | 2 +-
package/network-manager/network-manager.mk | 2 +-
package/nfs-utils/nfs-utils.mk | 2 +-
package/ntfs-3g/ntfs-3g.mk | 2 +-
package/ofono/ofono.mk | 2 +-
package/opus-tools/opus-tools.mk | 2 +-
package/pango/pango.mk | 2 +-
package/pcmanfm/pcmanfm.mk | 2 +-
package/pcsc-lite/pcsc-lite.mk | 2 +-
package/pixman/pixman.mk | 2 +-
package/qt/qt.mk | 2 +-
package/radvd/radvd.mk | 2 +-
package/rrdtool/rrdtool.mk | 2 +-
package/rtorrent/rtorrent.mk | 2 +-
package/shared-mime-info/shared-mime-info.mk | 4 ++--
package/sylpheed/sylpheed.mk | 2 +-
package/tiff/tiff.mk | 2 +-
package/transmission/transmission.mk | 2 +-
package/udev/udev.mk | 2 +-
package/unionfs/unionfs.mk | 2 +-
package/usbutils/usbutils.mk | 2 +-
package/ushare/ushare.mk | 2 +-
package/util-linux/util-linux.mk | 4 ++--
package/wpa_supplicant/wpa_supplicant.mk | 2 +-
package/x11r7/libxcb/libxcb.mk | 2 +-
package/x11r7/xapp_xf86dga/xapp_xf86dga.mk | 2 +-
package/x11r7/xapp_xlogo/xapp_xlogo.mk | 2 +-
package/x11r7/xfont_encodings/xfont_encodings.mk | 2 +-
package/x11r7/xfont_font-util/xfont_font-util.mk | 2 +-
.../xserver_xorg-server/xserver_xorg-server.mk | 2 +-
110 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 0d4d690..987a1cb 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -49,7 +49,7 @@ else
ATK_CONF_OPT += --without-x
endif
-ATK_DEPENDENCIES = libglib2 host-pkg-config
+ATK_DEPENDENCIES = libglib2 host-pkgconf
HOST_ATK_CONF_OPT = \
--disable-glibtest
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 03dc368..5f07a2f 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -85,7 +85,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
--with-autoipd-user=default \
--with-autoipd-group=default
-AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkg-config
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkgconf
ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
AVAHI_DEPENDENCIES += libdaemon
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 2a453bb..59a032a 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -38,7 +38,7 @@ CAIRO_CONF_OPT = \
--enable-trace=no \
--enable-interpreter=no
-CAIRO_DEPENDENCIES = host-pkg-config fontconfig pixman
+CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
CAIRO_CONF_OPT += --enable-directfb
diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 73db67f..a9e58d1 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -7,7 +7,7 @@ CCID_VERSION = 1.4.8
CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
CCID_SITE = http://alioth.debian.org/frs/download.php/3768
CCID_INSTALL_STAGING = YES
-CCID_DEPENDENCIES = pcsc-lite host-pkg-config libusb
+CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)
define CCID_INSTALL_UDEV_RULES
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 71ca660..6164df2 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -85,7 +85,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
$(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \
$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http)
-COLLECTD_DEPENDENCIES = host-pkg-config \
+COLLECTD_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \
$(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \
$(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 6f438fc..b8c8f5a 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -7,7 +7,7 @@
CONNTRACK_TOOLS_VERSION = 1.2.2
CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
-CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \
+CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
libnetfilter_conntrack libnetfilter_cttimeout
CONNTRACK_TOOLS_LICENSE = GPLv2
CONNTRACK_TOOLS_LICENSE_FILES = COPYING
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 93aa520..318e1b9 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -21,7 +21,7 @@ DBUS_GLIB_CONF_OPT = --localstatedir=/var \
--disable-doxygen-docs \
--enable-asserts=yes
-DBUS_GLIB_DEPENDENCIES = host-pkg-config dbus host-dbus host-dbus-glib libglib2 expat
+DBUS_GLIB_DEPENDENCIES = host-pkgconf dbus host-dbus host-dbus-glib libglib2 expat
HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 1190d2f..f848bfd 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -7,7 +7,7 @@ DBUS_VERSION = 1.4.20
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
DBUS_INSTALL_STAGING = YES
-DBUS_DEPENDENCIES = host-pkg-config
+DBUS_DEPENDENCIES = host-pkgconf
DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
DBUS_CONF_OPT = --with-dbus-user=dbus \
@@ -65,7 +65,7 @@ endef
DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP
-HOST_DBUS_DEPENDENCIES = host-pkg-config host-expat
+HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat
HOST_DBUS_CONF_OPT = \
--with-dbus-user=dbus \
--disable-tests \
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index e5763d7..dd247f0 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -120,7 +120,7 @@ ifeq ($(BR2_PACKAGE_DIRECTB_TESTS),y)
DIRECTFB_CONF_OPT += --with-tests
endif
-HOST_DIRECTFB_DEPENDENCIES = host-pkg-config host-libpng
+HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng
HOST_DIRECTFB_CONF_OPT = \
--disable-debug \
--disable-multi \
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 203a2e2..dac30e5 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -33,7 +33,7 @@ ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
endif
ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
- DNSMASQ_DEPENDENCIES += host-pkg-config libnetfilter_conntrack
+ DNSMASQ_DEPENDENCIES += host-pkgconf libnetfilter_conntrack
endif
ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
@@ -44,7 +44,7 @@ endef
endif
ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
- DNSMASQ_DEPENDENCIES += lua host-pkg-config
+ DNSMASQ_DEPENDENCIES += lua host-pkgconf
DNSMASQ_MAKE_OPT += LDFLAGS+="-ldl"
define DNSMASQ_ENABLE_LUA
@@ -59,7 +59,7 @@ ifneq ($(BR2_LARGEFILE),y)
endif
ifeq ($(BR2_PACKAGE_DBUS),y)
- DNSMASQ_DEPENDENCIES += host-pkg-config dbus
+ DNSMASQ_DEPENDENCIES += host-pkgconf dbus
endif
define DNSMASQ_FIX_PKGCONFIG
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 9839d88..95799e8 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -16,6 +16,6 @@ DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
-DOCKER_DEPENDENCIES = host-pkg-config libglib2 xserver_xorg-server
+DOCKER_DEPENDENCIES = host-pkgconf libglib2 xserver_xorg-server
$(eval $(autotools-package))
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 049bc29..e958158 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -21,7 +21,7 @@ E2FSPROGS_CONF_OPT = \
--disable-e2initrd-helper \
--disable-testio-debug
-E2FSPROGS_DEPENDENCIES = host-pkg-config util-linux
+E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
E2FSPROGS_MAKE_OPT = \
LDCONFIG=true
@@ -30,7 +30,7 @@ define HOST_E2FSPROGS_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
endef
# we don't have a host-util-linux
-HOST_E2FSPROGS_DEPENDENCIES = host-pkg-config
+HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
# binaries to keep or remove
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index df8db0d..b495bdb 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -9,9 +9,9 @@ LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
LIBECORE_SITE = http://download.enlightenment.org/releases/
LIBECORE_INSTALL_STAGING = YES
-LIBECORE_DEPENDENCIES = host-pkg-config libeina
+LIBECORE_DEPENDENCIES = host-pkgconf libeina
-HOST_LIBECORE_DEPENDENCIES = host-pkg-config host-libeina host-libevas
+HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
HOST_LIBECORE_CONF_OPT += \
--enable-ecore-evas \
--disable-simple-x11 \
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 04c48a4..4ecb0f8 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -9,7 +9,7 @@ LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
LIBEDBUS_SITE = http://download.enlightenment.org/releases/
LIBEDBUS_INSTALL_STAGING = YES
-LIBEDBUS_DEPENDENCIES = host-pkg-config dbus libeina libecore
+LIBEDBUS_DEPENDENCIES = host-pkgconf dbus libeina libecore
ifeq ($(BR2_PACKAGE_LIBEDBUS_BLUEZ),y)
LIBEDBUS_CONF_OPT += --enable-ebluez
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index e6d9ab3..8b4814e 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -9,7 +9,7 @@ LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
LIBEDJE_SITE = http://download.enlightenment.org/releases/
LIBEDJE_INSTALL_STAGING = YES
-LIBEDJE_DEPENDENCIES = host-pkg-config lua libeina libeet libecore libevas \
+LIBEDJE_DEPENDENCIES = host-pkgconf lua libeina libeet libecore libevas \
libembryo
ifeq ($(BR2_PACKAGE_LIBEDJE_CC),y)
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index 3ca12d3..cb64675 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -9,7 +9,7 @@ LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
LIBEET_SITE = http://download.enlightenment.org/releases/
LIBEET_INSTALL_STAGING = YES
-LIBEET_DEPENDENCIES = host-pkg-config zlib jpeg libeina
+LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index 2391379..465fee1 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -9,7 +9,7 @@ LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
LIBEINA_SITE = http://download.enlightenment.org/releases/
LIBEINA_INSTALL_STAGING = YES
-LIBEINA_DEPENDENCIES = host-pkg-config
+LIBEINA_DEPENDENCIES = host-pkgconf
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index db1696d..5484ccf 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -9,7 +9,7 @@ LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
LIBEMBRYO_INSTALL_STAGING = YES
-LIBEMBRYO_DEPENDENCIES = host-pkg-config libeina
+LIBEMBRYO_DEPENDENCIES = host-pkgconf libeina
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 3baf23b..594db60 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -9,9 +9,9 @@ LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
LIBEVAS_SITE = http://download.enlightenment.org/releases/
LIBEVAS_INSTALL_STAGING = YES
-LIBEVAS_DEPENDENCIES = host-pkg-config zlib libeina freetype
+LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype
-HOST_LIBEVAS_DEPENDENCIES = host-pkg-config host-zlib host-libeina \
+HOST_LIBEVAS_DEPENDENCIES = host-pkgconf host-zlib host-libeina \
host-freetype host-libpng host-jpeg
HOST_LIBEVAS_CONF_OPT += \
--enable-image-loader-png \
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 215425a..896dfc6 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -7,6 +7,6 @@ ENCHANT_VERSION = 1.5.0
ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
ENCHANT_INSTALL_STAGING = YES
-ENCHANT_DEPENDENCIES = libglib2 host-pkg-config
+ENCHANT_DEPENDENCIES = libglib2 host-pkgconf
$(eval $(autotools-package))
diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk
index 582d1a7..ffda1bf 100644
--- a/package/evtest/evtest.mk
+++ b/package/evtest/evtest.mk
@@ -10,7 +10,7 @@ EVTEST_SOURCE = evtest-$(EVTEST_VERSION).tar.bz2
EVTEST_SITE = http://pkgs.fedoraproject.org/repo/pkgs/evtest/evtest-1.30.tar.bz2/27c0902839babfd07136f232c63c895c/
EVTEST_LICENSE = GPLv2
EVTEST_LICENSE_FILES = COPYING
-EVTEST_DEPENDENCIES = host-pkg-config
+EVTEST_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_EVTEST_CAPTURE),y)
EVTEST_DEPENDENCIES += libxml2
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 5b19b4c..e650723 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -9,7 +9,7 @@ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSIO
EXPAT_INSTALL_STAGING = YES
EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
-EXPAT_DEPENDENCIES = host-pkg-config
+EXPAT_DEPENDENCIES = host-pkgconf
EXPAT_LICENSE = MIT
EXPAT_LICENSE_FILES = COPYING
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 796c37c..a34c9ad 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -9,11 +9,11 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
FREETYPE_INSTALL_STAGING = YES
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = host-pkg-config \
+FREETYPE_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_ZLIB),zlib) \
$(if $(BR2_PACKAGE_BZIP2),bzip2)
-HOST_FREETYPE_DEPENDENCIES = host-pkg-config
+HOST_FREETYPE_DEPENDENCIES = host-pkgconf
define FREETYPE_FREETYPE_CONFIG_STAGING_FIXUP
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 92a34bf..4e00c40 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -42,7 +42,7 @@ endif
GDK_PIXBUF_DEPENDENCIES += \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
$(if $(BR2_ENABLE_LOCALE),,libiconv) \
- host-pkg-config libglib2
+ host-pkgconf libglib2
define GDK_PIXBUF_POST_INSTALL_TWEAKS
$(INSTALL) -m 755 -D package/gdk-pixbuf/S26gdk-pixbuf \
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 823ba39..b1eec4d 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -14,7 +14,7 @@ GLIB_NETWORKING_INSTALL_STAGING = YES
GLIB_NETWORKING_DEPENDENCIES = \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
- host-pkg-config \
+ host-pkgconf \
host-intltool \
libglib2
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index a136cf4..5f914ff 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -8,7 +8,7 @@ GMPC_VERSION = 11.8.16
GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
GMPC_CONF_OPT = --disable-mmkeys --disable-unique
-GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkg-config host-vala \
+GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \
libglib2 libgtk2 libmpd libsoup sqlite \
xlib_libICE xlib_libSM xlib_libX11 \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index e889821..f9bab73 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -9,7 +9,7 @@ GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
GNUTLS_LICENSE_FILES = COPYING lib/COPYING
-GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_DEPENDENCIES = host-pkgconf libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
--without-p11-kit
GNUTLS_INSTALL_STAGING = YES
diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index 3757f85..b64c0db 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -6,7 +6,7 @@
GOB2_VERSION = 2.0.18
GOB2_SITE = http://ftp.5z.com/pub/gob
-GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
+GOB2_DEPENDENCIES = libglib2 flex bison host-pkgconf host-flex
HOST_GOB2_DEPENDENCIES = host-libglib2
$(eval $(autotools-package))
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 4482a11..e472044 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -9,7 +9,7 @@ GPSD_LICENSE = BSD-3c
GPSD_LICENSE_FILES = COPYING
GPSD_INSTALL_STAGING = YES
-GPSD_DEPENDENCIES = host-scons host-pkg-config
+GPSD_DEPENDENCIES = host-scons host-pkgconf
GPSD_LDFLAGS = $(TARGET_LDFLAGS)
@@ -45,7 +45,7 @@ endif
# Enable or disable Qt binding
ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)"
- GPSD_DEPENDENCIES += qt host-pkg-config
+ GPSD_DEPENDENCIES += qt host-pkgconf
else
GPSD_SCONS_OPTS += libQgpsmm=no
endif
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 2f64cd0..e6d764d 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -6,7 +6,7 @@
GQVIEW_VERSION = 2.1.5
GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
-GQVIEW_DEPENDENCIES = host-pkg-config libgtk2
+GQVIEW_DEPENDENCIES = host-pkgconf libgtk2
$(eval $(autotools-package))
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index dcb94ee..1ae094f 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -9,7 +9,7 @@ GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
GVFS_INSTALL_STAGING = YES
-GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
+GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
GVFS_CONF_OPT = \
--disable-gconf \
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 6d34ad3..61a379d 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -33,7 +33,7 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
--without-fpx \
--without-x
-IMAGEMAGICK_DEPENDENCIES = host-pkg-config
+IMAGEMAGICK_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
IMAGEMAGICK_CONF_OPT += --with-fontconfig
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index 3adcd99..3c6c473 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -7,7 +7,7 @@ IMLIB2_VERSION = 1.4.5
IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
IMLIB2_INSTALL_STAGING = YES
-IMLIB2_DEPENDENCIES = host-pkg-config freetype
+IMLIB2_DEPENDENCIES = host-pkgconf freetype
IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index b8d0a24..999c5cb 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -7,7 +7,7 @@
IPSET_VERSION = 6.14
IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
IPSET_SITE = http://ipset.netfilter.org
-IPSET_DEPENDENCIES = libmnl host-pkg-config
+IPSET_DEPENDENCIES = libmnl host-pkgconf
IPSET_CONF_OPT = --with-kmod=no
IPSET_LICENSE = GPLv2
IPSET_LICENSE_FILES = COPYING
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 17c191e..3243b3f 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -8,7 +8,7 @@ IPTABLES_VERSION = 1.4.16.3
IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
IPTABLES_INSTALL_STAGING = YES
-IPTABLES_DEPENDENCIES = host-pkg-config
+IPTABLES_DEPENDENCIES = host-pkgconf
IPTABLES_LICENSE = GPLv2
IPTABLES_LICENSE_FILES = COPYING
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 654282a..7633124 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -7,7 +7,7 @@
IW_VERSION = 3.7
IW_SOURCE = iw-$(IW_VERSION).tar.bz2
IW_SITE = http://wireless.kernel.org/download/iw
-IW_DEPENDENCIES = host-pkg-config libnl
+IW_DEPENDENCIES = host-pkgconf libnl
IW_CONFIG = $(IW_DIR)/.config
IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index fb07ae6..10f70f5 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -2,7 +2,7 @@ KMOD_VERSION = 10
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
KMOD_INSTALL_STAGING = YES
-KMOD_DEPENDENCIES = host-pkg-config
+KMOD_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_ZLIB),y)
KMOD_DEPENDENCIES += zlib
diff --git a/package/libao/libao.mk b/package/libao/libao.mk
index 74322b2..aee85a9 100644
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -6,7 +6,7 @@
LIBAO_VERSION = 1.1.0
LIBAO_SITE = http://downloads.xiph.org/releases/ao
-LIBAO_DEPENDENCIES = host-pkg-config
+LIBAO_DEPENDENCIES = host-pkgconf
LIBAO_INSTALL_STAGING = YES
LIBAO_CONF_OPT = --disable-esd --disable-wmm --disable-arts \
--disable-nas --disable-pulse
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 214402a..eab9c34 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -11,6 +11,6 @@ LIBDAEMON_LICENSE_FILES = LICENSE
LIBDAEMON_INSTALL_STAGING = YES
LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
LIBDAEMON_CONF_OPT = --disable-lynx
-LIBDAEMON_DEPENDENCIES = host-pkg-config
+LIBDAEMON_DEPENDENCIES = host-pkgconf
$(eval $(autotools-package))
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 76ee763..fbfc95e 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -15,7 +15,7 @@ LIBDRM_DEPENDENCIES = \
xlib_libXmu \
xproto_dri2proto \
pthread-stubs \
- host-pkg-config
+ host-pkgconf
ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)
LIBDRM_CONF_OPT += --enable-intel
diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index 2fefe43..520f58d 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -10,7 +10,7 @@ LIBDVDNAV_SITE = http://dvdnav.mplayerhq.hu/releases
LIBDVDNAV_AUTORECONF = YES
LIBDVDNAV_INSTALL_STAGING = YES
-LIBDVDNAV_DEPENDENCIES = libdvdread host-pkg-config
+LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf
# By default libdvdnav tries to find dvdread-config in $PATH. Because
# of cross compilation, we prefer using pkg-config.
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 6770276..d72ab61 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -8,7 +8,7 @@ LIBEXOSIP2_VERSION = 3.6.0
LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
LIBEXOSIP2_INSTALL_STAGING = YES
-LIBEXOSIP2_DEPENDENCIES = host-pkg-config libosip2
+LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBEXOSIP2_DEPENDENCIES += openssl
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index f7af18a..1c51564 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -9,6 +9,6 @@ LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
LIBEXIF_INSTALL_STAGING = YES
LIBEXIF_CONF_OPT = --disable-docs
-LIBEXIF_DEPENDENCIES = host-pkg-config
+LIBEXIF_DEPENDENCIES = host-pkgconf
$(eval $(autotools-package))
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index e8a8a60..e3ea9b9 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -15,6 +15,6 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
LIBGAIL_CONF_OPT += --disable-x
endif
-LIBGAIL_DEPENDENCIES = host-pkg-config libgtk2 pango
+LIBGAIL_DEPENDENCIES = host-pkgconf libgtk2 pango
$(eval $(autotools-package))
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 78a1fdb..6a6641c 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -7,7 +7,7 @@ LIBGLADE_VERSION = 2.6.4
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 = host-pkg-config libglib2 libgtk2 atk libxml2
+LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2
define LIBGLADE_INSTALL_FIX
rm -rf $(TARGET_DIR)/usr/share/xml/libglade \
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index dcd7996..a32cab2 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -54,9 +54,9 @@ HOST_LIBGLIB2_CONF_OPT = \
--disable-gtk-doc \
--enable-debug=no \
-LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
+LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
-HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib
+HOST_LIBGLIB2_DEPENDENCIES = host-pkgconf host-libffi host-zlib
ifneq ($(BR2_ENABLE_LOCALE),y)
LIBGLIB2_DEPENDENCIES += libiconv
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index e80e137..9adb6b9 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -69,7 +69,7 @@ LIBGTK2_CONF_OPT = --disable-glibtest \
--enable-explicit-deps=no \
--disable-debug
-LIBGTK2_DEPENDENCIES = host-pkg-config host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
+LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LIBGTK2_CONF_OPT += --with-gdktarget=directfb
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index c55f2c5..b06b1ec 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -9,7 +9,7 @@ LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
LIBIDN_INSTALL_STAGING = YES
LIBIDN_CONF_ENV = EMACS="no"
LIBIDN_CONF_OPT = --disable-java --enable-csharp=no
-LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
define LIBIDN_REMOVE_BINARY
rm -f $(TARGET_DIR)/usr/bin/idn
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index bc66f53..5ab4f37 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -9,6 +9,6 @@ LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VE
LIBMMS_INSTALL_STAGING = YES
-LIBMMS_DEPENDENCIES = host-pkg-config libglib2
+LIBMMS_DEPENDENCIES = host-pkgconf libglib2
$(eval $(autotools-package))
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index c602903..a5d832f 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -8,6 +8,6 @@ LIBNETFILTER_CONNTRACK_VERSION = 1.0.1
LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
-LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkg-config libnfnetlink
+LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink
$(eval $(autotools-package))
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
index 4792980..4bdc0fc 100644
--- a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -8,6 +8,6 @@ LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0
LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2
LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files
LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
-LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkg-config libmnl
+LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl
$(eval $(autotools-package))
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index 08892b3..c343551 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -11,7 +11,7 @@ LIBNFC_LICENSE_FILES = COPYING
LIBNFC_AUTORECONF = YES
LIBNFC_INSTALL_STAGING = YES
-LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat
+LIBNFC_DEPENDENCIES = host-pkgconf libusb libusb-compat
# N.B. The acr122 driver requires pcsc-lite.
LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
index 6695fcb..9eb0e7d 100644
--- a/package/liboauth/liboauth.mk
+++ b/package/liboauth/liboauth.mk
@@ -8,7 +8,7 @@ LIBOAUTH_SOURCE = liboauth-$(LIBOAUTH_VERSION).tar.gz
LIBOAUTH_SITE = http://liboauth.sourceforge.net/pool
LIBOAUTH_INSTALL_STAGING = YES
-LIBOAUTH_DEPENDENCIES += host-pkg-config openssl
+LIBOAUTH_DEPENDENCIES += host-pkgconf openssl
ifeq ($(BR2_PACKAGE_LIBCURL),y)
LIBOAUTH_DEPENDENCIES += libcurl
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 4020d62..519ba9d 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -7,6 +7,6 @@ LIBOGG_VERSION = 1.3.0
LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
LIBOGG_INSTALL_STAGING = YES
-LIBOGG_DEPENDENCIES = host-pkg-config
+LIBOGG_DEPENDENCIES = host-pkgconf
$(eval $(autotools-package))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 3bcd1b8..d834876 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -11,7 +11,7 @@ LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SER
LIBPNG_LICENSE = libpng license
LIBPNG_LICENSE_FILES = LICENSE
LIBPNG_INSTALL_STAGING = YES
-LIBPNG_DEPENDENCIES = host-pkg-config zlib
+LIBPNG_DEPENDENCIES = host-pkgconf zlib
define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk
index 533d95f..950e5b5 100644
--- a/package/libsamplerate/libsamplerate.mk
+++ b/package/libsamplerate/libsamplerate.mk
@@ -7,7 +7,7 @@
LIBSAMPLERATE_VERSION = 0.1.8
LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
LIBSAMPLERATE_INSTALL_STAGING = YES
-LIBSAMPLERATE_DEPENDENCIES = host-pkg-config
+LIBSAMPLERATE_DEPENDENCIES = host-pkgconf
LIBSAMPLERATE_CONF_OPT = --disable-fftw --program-transform-name=''
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 30655ba..2f173df 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,7 +19,7 @@ endif
LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 libglib2 libxml2
ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
LIBSOUP_DEPENDENCIES += glib-networking
diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index 9baa4b0..076a783 100644
--- a/package/libsvgtiny/libsvgtiny.mk
+++ b/package/libsvgtiny/libsvgtiny.mk
@@ -7,7 +7,7 @@
LIBSVGTINY_SITE = svn://svn.netsurf-browser.org/trunk/libsvgtiny
LIBSVGTINY_VERSION = 12121
LIBSVGTINY_INSTALL_STAGING = YES
-LIBSVGTINY_DEPENDENCIES = libxml2 host-gperf host-pkg-config
+LIBSVGTINY_DEPENDENCIES = libxml2 host-gperf host-pkgconf
define LIBSVGTINY_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 5714e70..1a19bcd 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -15,6 +15,6 @@ LIBTHEORA_CONF_OPT = \
--disable-examples \
--disable-spec
-LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkg-config
+LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkgconf
$(eval $(autotools-package))
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
index 0c29661..892195b 100644
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -6,7 +6,7 @@
LIBTORRENT_VERSION = 0.13.2
LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
-LIBTORRENT_DEPENDENCIES = host-pkg-config libsigc \
+LIBTORRENT_DEPENDENCIES = host-pkgconf libsigc \
$(if $(BR2_PACKAGE_OPENSSL),openssl)
LIBTORRENT_CONF_OPT = --enable-aligned \
$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index d42abf5..848c705 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -6,7 +6,7 @@
LIBUSB_COMPAT_VERSION = 0.1.4
LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
-LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb
+LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb
LIBUSB_COMPAT_INSTALL_STAGING = YES
define LIBUSB_COMPAT_FIXUP_CONFIG
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index d4ca31e..06a1485 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -8,7 +8,7 @@ LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
LIBUSB_LICENSE = LGPLv2.1+
LIBUSB_LICENSE_FILES = COPYING
-LIBUSB_DEPENDENCIES = host-pkg-config
+LIBUSB_DEPENDENCIES = host-pkgconf
LIBUSB_INSTALL_STAGING = YES
$(eval $(autotools-package))
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index f94670e..ac55a95 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -31,7 +31,7 @@ LIBVNCSERVER_CONF_OPT += --without-gcrypt
endif
ifeq ($(BR2_PACKAGE_GNUTLS),y)
-LIBVNCSERVER_DEPENDENCIES += gnutls host-pkg-config
+LIBVNCSERVER_DEPENDENCIES += gnutls host-pkgconf
else
LIBVNCSERVER_CONF_OPT += --without-gnutls
endif
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index 009143b..c8ff213 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -11,6 +11,6 @@ LIBVORBIS_INSTALL_STAGING = YES
LIBVORBIS_CONF_OPT = --disable-oggtest
-LIBVORBIS_DEPENDENCIES = host-pkg-config libogg
+LIBVORBIS_DEPENDENCIES = host-pkgconf libogg
$(eval $(autotools-package))
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index b63200f..71f2bd1 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -24,7 +24,7 @@ endef
LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
-HOST_LIBXML2_DEPENDENCIES = host-pkg-config
+HOST_LIBXML2_DEPENDENCIES = host-pkgconf
HOST_LIBXML2_CONF_OPT = --without-debug --without-python
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 4bad5ba..08ce372 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -8,7 +8,7 @@ LIGHTTPD_VERSION = 1.4.31
LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
LIGHTTPD_LICENSE = BSD-3c
LIGHTTPD_LICENSE_FILES = COPYING
-LIGHTTPD_DEPENDENCIES = host-pkg-config
+LIGHTTPD_DEPENDENCIES = host-pkgconf
LIGHTTPD_CONF_OPT = \
--libdir=/usr/lib/lighttpd \
--libexecdir=/usr/lib \
diff --git a/package/links/links.mk b/package/links/links.mk
index 9dbf0ad..4537b3a 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -7,7 +7,7 @@
LINKS_VERSION = 2.5
LINKS_SITE = http://links.twibright.com/download
LINKS_CONF_OPT = --without-x
-LINKS_DEPENDENCIES = host-pkg-config
+LINKS_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
LINKS_CONF_OPT += --enable-graphics
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index afd2966..efe70a9 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -10,7 +10,7 @@ LINPHONE_CONF_OPT = \
--enable-external-ortp \
--enable-external-mediastreamer
-LINPHONE_DEPENDENCIES = host-pkg-config ortp mediastreamer libeXosip2 speex
+LINPHONE_DEPENDENCIES = host-pkgconf ortp mediastreamer libeXosip2 speex
ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
LINPHONE_CONF_OPT += --enable-gtk_ui
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 6fd1987..de11dfc 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -8,7 +8,7 @@ MATCHBOX_LIB_VERSION = 1.9
MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
MATCHBOX_LIB_INSTALL_STAGING = YES
-MATCHBOX_LIB_DEPENDENCIES = host-pkg-config expat xlib_libXext
+MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
define MATCHBOX_LIB_POST_INSTALL_FIXES
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 1f4e1d4..b324126 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -1,7 +1,7 @@
MEDIASTREAMER_VERSION = 2.8.2
MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
MEDIASTREAMER_INSTALL_STAGING = YES
-MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkg-config ortp
+MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp
# tests fail linking on some architectures, so disable them
MEDIASTREAMER_CONF_OPT = --disable-tests
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 33f94cf..44cce40 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -9,7 +9,7 @@ MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/
MIDORI_DEPENDENCIES = \
host-intltool \
- host-pkg-config \
+ host-pkgconf \
host-vala \
libgtk2 \
libsexy \
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 6d0607f..06b023e 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -10,7 +10,7 @@ MINICOM_LICENSE = GPLv2+
MINICOM_LICENSE_FILES = COPYING
# pkg-config is only used to check for liblockdev, which we don't have
-# in BR, so instead of adding host-pkg-config as a dependency, simply
+# in BR, so instead of adding host-pkgconf as a dependency, simply
# make sure the host version isn't used so we don't end up with problems
# if people have liblockdev1-dev installed
MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index c74d581..8623297 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -6,6 +6,6 @@
MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20110511
MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
-MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkg-config
+MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkgconf
$(eval $(autotools-package))
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index 6b641f7..87a2fbb 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -8,7 +8,7 @@ MSMTP_VERSION = 1.4.27
MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.bz2
-MSMTP_DEPENDENCIES += host-pkg-config
+MSMTP_DEPENDENCIES += host-pkgconf
ifeq ($(BR2_PACKAGE_OPENSSL),y)
MSMTP_CONF_OPT += --with-ssl=openssl
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index f921ec9..74b4c98 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -13,6 +13,6 @@ define GST_DSP_UNINSTALL_TARGET_CMDS
$(RM) $(TARGET_DIR)/usr/lib/gstreamer-0.10/libgstdsp.so
endef
-GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkg-config
+GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkgconf
$(eval $(generic-package))
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index 9413ff2..ead490e 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -8,7 +8,7 @@ GST_FFMPEG_VERSION = 0.10.13
GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = host-pkg-config gstreamer gst-plugins-base ffmpeg
+GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base ffmpeg
GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
ifeq ($(BR2_PACKAGE_BZIP2),y)
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index 1943d03..a9841b1 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -23,6 +23,6 @@ GSTREAMER_CONF_OPT = \
--disable-loadsave \
$(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug)
-GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config
+GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf
$(eval $(autotools-package))
diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index a022312..a251f02 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -8,7 +8,7 @@ LAME_VERSION_MAJOR = 3.99
LAME_VERSION_MINOR = 5
LAME_VERSION = $(LAME_VERSION_MAJOR).$(LAME_VERSION_MINOR)
LAME_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR)
-LAME_DEPENDENCIES = host-pkg-config
+LAME_DEPENDENCIES = host-pkgconf
LAME_INSTALL_STAGING = YES
LAME_CONF_ENV = GTK_CONFIG=/bin/false
LAME_CONF_OPT = --enable-dynamic-frontends
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index fb4c550..ab3a357 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -6,7 +6,7 @@
MPD_VERSION = 0.17.2
MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
-MPD_DEPENDENCIES = host-pkg-config libglib2
+MPD_DEPENDENCIES = host-pkgconf libglib2
MPD_LICENSE = GPLv2
MPD_LICENSE_FILES = COPYING
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 6396fef..e78eb42 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -15,7 +15,7 @@ PULSEAUDIO_CONF_OPT = \
$(if $(BR2_HAVE_DOCUMENTATION),,--disable-manpages)
PULSEAUDIO_DEPENDENCIES = \
- host-pkg-config libtool json-c libsndfile speex host-intltool \
+ host-pkgconf libtool json-c libsndfile speex host-intltool \
$(if $(BR2_NEEDS_GETTEXT),gettext) \
$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 52d5066..c2e4949 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -8,7 +8,7 @@ NEON_SITE = http://www.webdav.org/neon/
NEON_INSTALL_STAGING = YES
NEON_CONF_OPT = --without-gssapi --disable-rpath
-NEON_DEPENDENCIES = host-pkg-config
+NEON_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
NEON_CONF_OPT += --with-zlib=$(STAGING_DIR)
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 6c98d64..d14c98d 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -7,7 +7,7 @@ NETWORK_MANAGER_VERSION = 0.9.2.0
NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/
NETWORK_MANAGER_INSTALL_STAGING = YES
-NETWORK_MANAGER_DEPENDENCIES = host-pkg-config udev dbus-glib libnl wireless_tools gnutls util-linux
+NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl wireless_tools gnutls util-linux
NETWORK_MANAGER_CONF_ENV = \
ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 61e0d67..41a0e05 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -8,7 +8,7 @@ NFS_UTILS_VERSION = 1.2.6
NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
NFS_UTILS_SITE = http://downloads.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
NFS_UTILS_AUTORECONF = YES
-NFS_UTILS_DEPENDENCIES = host-pkg-config
+NFS_UTILS_DEPENDENCIES = host-pkgconf
NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index f6db4ef..d2e6861 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -9,7 +9,7 @@ NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
NTFS_3G_SITE = http://tuxera.com/opensource
NTFS_3G_CONF_OPT = --disable-ldconfig
NTFS_3G_INSTALL_STAGING = YES
-NTFS_3G_DEPENDENCIES = host-pkg-config
+NTFS_3G_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_LIBFUSE),y)
NTFS_3G_CONF_OPT += --with-fuse=external
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 6cd7cdd..6e6849b 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -6,7 +6,7 @@
OFONO_VERSION = 1.6
OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
OFONO_DEPENDENCIES = \
- host-pkg-config \
+ host-pkgconf \
dbus \
libglib2 \
libcap-ng \
diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
index 233ad9a..2b649dc 100644
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -7,7 +7,7 @@
OPUS_TOOLS_VERSION = 0.1.5
OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
OPUS_TOOLS_CONF_OPT = --disable-oggtest --disable-opustest
-OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkg-config
+OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf
ifeq ($(BR2_PACKAGE_LIBPCAP),y)
OPUS_TOOLS_DEPENDENCIES += libpcap
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 86ab474..7ba53ee 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -41,7 +41,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf libglib2 cairo
ifeq ($(BR2_PACKAGE_XORG7),y)
PANGO_CONF_OPT += --with-x \
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 561de1f..1f1a330 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -7,7 +7,7 @@ PCMANFM_VERSION = 0.3.5.9
PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
PCMANFM_CONF_OPT = --disable-hal
-PCMANFM_DEPENDENCIES = host-pkg-config libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
$(eval $(autotools-package))
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index 49eeec7..d1d7691 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -7,7 +7,7 @@ PCSC_LITE_VERSION = 1.8.6
PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/3757
PCSC_LITE_INSTALL_STAGING = YES
-PCSC_LITE_DEPENDENCIES = host-pkg-config
+PCSC_LITE_DEPENDENCIES = host-pkgconf
# - libudev and libusb are optional
# - libudev and libusb can't be used together
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 8ce435d..4879594 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -6,7 +6,7 @@
PIXMAN_VERSION = 0.25.2
PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
PIXMAN_INSTALL_STAGING = YES
-PIXMAN_DEPENDENCIES = host-pkg-config
+PIXMAN_DEPENDENCIES = host-pkgconf
# don't build gtk based demos
PIXMAN_CONF_OPT = --disable-gtk
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e000ecb..be0808d 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -14,7 +14,7 @@
QT_VERSION = 4.8.3
QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
QT_SITE = http://releases.qt-project.org/qt4/source
-QT_DEPENDENCIES = host-pkg-config
+QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 33267f0..6151236 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -6,7 +6,7 @@
RADVD_VERSION = 1.9.1
RADVD_SITE = http://www.litech.org/radvd/dist
-RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkg-config
+RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkgconf
RADVD_AUTORECONF = YES
define RADVD_INSTALL_INITSCRIPT
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 1057d5d..7521aba 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -6,7 +6,7 @@
RRDTOOL_VERSION = 1.2.30
RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
-RRDTOOL_DEPENDENCIES = host-pkg-config freetype libart libpng zlib
+RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
RRDTOOL_AUTORECONF = YES
RRDTOOL_INSTALL_STAGING = YES
RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk
index c44cd57..ff1ae2f 100644
--- a/package/rtorrent/rtorrent.mk
+++ b/package/rtorrent/rtorrent.mk
@@ -6,7 +6,7 @@
RTORRENT_VERSION = 0.9.2
RTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
-RTORRENT_DEPENDENCIES = host-pkg-config libcurl libsigc libtorrent ncurses
+RTORRENT_DEPENDENCIES = host-pkgconf libcurl libsigc libtorrent ncurses
RTORRENT_AUTORECONF = YES
$(eval $(autotools-package))
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index f941dd9..a116840 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -10,12 +10,12 @@ SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess
SHARED_MIME_INFO_INSTALL_STAGING = YES
SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
-SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
+SHARED_MIME_INFO_DEPENDENCIES = host-pkgconf host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
SHARED_MIME_INFO_MAKE = $(MAKE1)
-HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
+HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkgconf host-intltool
HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
HOST_SHARED_MIME_INFO_MAKE = $(MAKE1)
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 491737e..cf55c90 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -11,7 +11,7 @@ SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
SYLPHEED_CONF_OPT = --disable-gtkspell
-SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2
+SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
# Remove the -I$(includedir) from the Makefiles
# because it refers to the host /usr/include.
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 145d929..e881647 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -11,7 +11,7 @@ TIFF_CONF_OPT = \
--disable-cxx \
--without-x \
-TIFF_DEPENDENCIES = host-pkg-config
+TIFF_DEPENDENCIES = host-pkgconf
TIFF_TOOLS_LIST =
ifeq ($(BR2_PACKAGE_TIFF_TIFF2PDF),y)
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 3f0694b..10315dc 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -7,7 +7,7 @@ TRANSMISSION_VERSION = 2.33
TRANSMISSION_SITE = http://download.transmissionbt.com/files/
TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.bz2
TRANSMISSION_DEPENDENCIES = \
- host-pkg-config \
+ host-pkgconf \
host-intltool \
libcurl \
libevent \
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index b9fc02f..c55db71 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -20,7 +20,7 @@ UDEV_CONF_OPT = \
--with-firmware-path=/lib/firmware \
--disable-introspection
-UDEV_DEPENDENCIES = host-gperf host-pkg-config util-linux kmod
+UDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y)
UDEV_CONF_OPT += --enable-rule_generator
diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index 6c86c57..89729fe 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -7,7 +7,7 @@
UNIONFS_VERSION = 0.26
UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.xz
-UNIONFS_DEPENDENCIES = libfuse host-pkg-config
+UNIONFS_DEPENDENCIES = libfuse host-pkgconf
UNIONFS_LICENSE = BSD-3c
UNIONFS_LICENSE_FILES = LICENSE
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 6e29571..87ae4b3 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -7,7 +7,7 @@
USBUTILS_VERSION = 006
USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils/
USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.gz
-USBUTILS_DEPENDENCIES = host-pkg-config libusb
+USBUTILS_DEPENDENCIES = host-pkgconf libusb
USBUTILS_INSTALL_STAGING = YES
# no configure in tarball
USBUTILS_AUTORECONF = YES
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 78cbcda..8f690fc 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -7,7 +7,7 @@
USHARE_VERSION = 1.1a
USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
USHARE_SITE = http://ushare.geexbox.org/releases
-USHARE_DEPENDENCIES = host-pkg-config libupnp
+USHARE_DEPENDENCIES = host-pkgconf libupnp
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
USHARE_DEPENDENCIES += gettext
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 71a6c53..f6028f4 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -9,13 +9,13 @@ UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
UTIL_LINUX_AUTORECONF = YES
UTIL_LINUX_INSTALL_STAGING = YES
-UTIL_LINUX_DEPENDENCIES = host-pkg-config
+UTIL_LINUX_DEPENDENCIES = host-pkgconf
UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
# We don't want the host-busybox dependency to be added automatically
-HOST_UTIL_LINUX_DEPENDENCIES = host-pkg-config
+HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
# If both util-linux and busybox are selected, make certain util-linux
# wins the fight over who gets to have their utils actually installed
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index d8c916b..febb80c 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -80,7 +80,7 @@ endif
endif
ifeq ($(BR2_PACKAGE_DBUS),y)
- WPA_SUPPLICANT_DEPENDENCIES += host-pkg-config dbus
+ WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
WPA_SUPPLICANT_MAKE_ENV = \
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index a053379..f7b1945 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -11,7 +11,7 @@ LIBXCB_INSTALL_STAGING = YES
LIBXCB_DEPENDENCIES = \
host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
- host-xcb-proto host-python host-pkg-config
+ host-xcb-proto host-python host-pkgconf
LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \
XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index c44573d..ea00d9c 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -8,7 +8,7 @@ XAPP_XF86DGA_VERSION = 1.0.2
XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2
XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XF86DGA_DEPENDENCIES = \
- host-pkg-config \
+ host-pkgconf \
xlib_libX11 \
xlib_libXxf86dga \
xlib_libXt \
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index effa060..c3467ba 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -8,6 +8,6 @@ XAPP_XLOGO_VERSION = 1.0.1
XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
- xlib_libXft host-pkg-config
+ xlib_libXft host-pkgconf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 22447a4..2113c07 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -7,7 +7,7 @@
XFONT_ENCODINGS_VERSION = 1.0.4
XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkg-config xutil_util-macros
+XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkgconf xutil_util-macros
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 832b441..f91b998 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -7,7 +7,7 @@
XFONT_FONT_UTIL_VERSION = 1.2.0
XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
+XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf
XFONT_FONT_UTIL_INSTALL_STAGING = YES
XFONT_FONT_UTIL_INSTALL_TARGET = NO
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 631dee8..ed5b904 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -53,7 +53,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
pixman \
openssl \
mcookie \
- host-pkg-config
+ host-pkgconf
XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
--disable-xnest --disable-xephyr --disable-dmx \
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCHv6 1/5] pkgconf: new package
From: Gustavo Zacarias @ 2012-10-23 1:47 UTC (permalink / raw)
To: buildroot
pkgconf is a drop-in replacement for pkg-config that doesn't need
itself to build and just requires a C89 compiler.
Instead of using a patch for hardcoded sysroot support (as the patch to
pkg-config does) we rely instead on a wrapper script that takes the
appropiate action.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 1 +
package/pkgconf/Config.in | 9 +++++++++
package/pkgconf/pkg-config.in | 2 ++
package/pkgconf/pkgconf.mk | 31 +++++++++++++++++++++++++++++++
4 files changed, 43 insertions(+), 0 deletions(-)
create mode 100644 package/pkgconf/Config.in
create mode 100644 package/pkgconf/pkg-config.in
create mode 100644 package/pkgconf/pkgconf.mk
diff --git a/package/Config.in b/package/Config.in
index 1650c71..0324735 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -84,6 +84,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/patch/Config.in"
endif
source "package/pkg-config/Config.in"
+source "package/pkgconf/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/sed/Config.in"
endif
diff --git a/package/pkgconf/Config.in b/package/pkgconf/Config.in
new file mode 100644
index 0000000..f95847f
--- /dev/null
+++ b/package/pkgconf/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PKGCONF
+ bool "pkgconf"
+ help
+ pkgconf is a program which helps to configure compiler and linker
+ flags for development frameworks. It is similar to pkg-config,
+ but was written from scratch in the summer of 2011 to replace
+ pkg-config, which now needs itself to build itself
+
+ https://github.com/nenolod/pkgconf
diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in
new file mode 100644
index 0000000..9da5187
--- /dev/null
+++ b/package/pkgconf/pkg-config.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+PKG_CONFIG_PATH=@PKG_CONFIG_PATH@ PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:- at STAGING_DIR@} $(dirname $0)/pkgconf $@
diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
new file mode 100644
index 0000000..6e025dc
--- /dev/null
+++ b/package/pkgconf/pkgconf.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# pkgconf
+#
+#############################################################
+
+PKGCONF_VERSION = 0.8.9
+PKGCONF_SITE = http://tortois.es/~nenolod/distfiles
+PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2
+
+PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config
+
+ifeq ($(BR2_PACKAGE_PKG_CONFIG),)
+define PKGCONF_LINK_PKGCONFIG
+ ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config
+endef
+endif
+
+define HOST_PKGCONF_INSTALL_WRAPPER
+ $(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
+ $(HOST_DIR)/usr/bin/pkg-config
+ $(SED) 's, at PKG_CONFIG_PATH@,$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig,' \
+ -e 's, at STAGING_DIR@,$(STAGING_DIR),' \
+ $(HOST_DIR)/usr/bin/pkg-config
+endef
+
+PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
+HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH] toolchain/binutils: add version 2.23
From: Gustavo Zacarias @ 2012-10-22 19:36 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/binutils/Config.in.host | 5 +++
package/binutils/binutils-2.23/120-sh-conf.patch | 29 +++++++++++++++
.../binutils-2.23/300-001_ld_makefile_patch.patch | 24 +++++++++++++
.../300-012_check_ldrunpath_length.patch | 21 +++++++++++
package/binutils/binutils-2.23/500-sysroot.patch | 37 ++++++++++++++++++++
5 files changed, 116 insertions(+), 0 deletions(-)
create mode 100644 package/binutils/binutils-2.23/120-sh-conf.patch
create mode 100644 package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch
create mode 100644 package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch
create mode 100644 package/binutils/binutils-2.23/500-sysroot.patch
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index a13d61b..26c5f73 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -31,6 +31,10 @@ choice
config BR2_BINUTILS_VERSION_2_22
depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
bool "binutils 2.22"
+
+ config BR2_BINUTILS_VERSION_2_23
+ depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+ bool "binutils 2.23"
endchoice
@@ -42,6 +46,7 @@ config BR2_BINUTILS_VERSION
default "2.21" if BR2_BINUTILS_VERSION_2_21
default "2.21.1" if BR2_BINUTILS_VERSION_2_21_1
default "2.22" if BR2_BINUTILS_VERSION_2_22
+ default "2.23" if BR2_BINUTILS_VERSION_2_23
config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
string "Additional binutils options"
diff --git a/package/binutils/binutils-2.23/120-sh-conf.patch b/package/binutils/binutils-2.23/120-sh-conf.patch
new file mode 100644
index 0000000..ea3d1b6
--- /dev/null
+++ b/package/binutils/binutils-2.23/120-sh-conf.patch
@@ -0,0 +1,29 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we
+fix that up too.. now we're able to actually build a real toolchain for
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more
+inept targets than that one, really. Go look, I promise).
+
+--- a/configure
++++ b/configure
+@@ -1495,7 +1495,7 @@
+ mips*-*-*)
+ noconfigdirs="$noconfigdirs gprof"
+ ;;
+- sh-*-* | sh64-*-*)
++ sh*-*-* | sh64-*-*)
+ case "${target}" in
+ sh*-*-elf)
+ ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -712,7 +712,7 @@
+ mips*-*-*)
+ noconfigdirs="$noconfigdirs gprof"
+ ;;
+- sh-*-* | sh64-*-*)
++ sh*-*-* | sh64-*-*)
+ case "${target}" in
+ sh*-*-elf)
+ ;;
diff --git a/package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000..5cb0f61
--- /dev/null
+++ b/package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch
@@ -0,0 +1,24 @@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.am 2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.am 2007-06-25 10:00:36.000000000 +0200
+@@ -18,7 +18,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.in 2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.in 2007-06-25 10:00:36.000000000 +0200
+@@ -287,7 +287,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000..df78310
--- /dev/null
+++ b/package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,21 @@
+diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
+--- binutils-2.21.orig/ld/emultempl/elf32.em 2010-10-29 09:10:36.000000000 -0300
++++ binutils-2.21/ld/emultempl/elf32.em 2010-12-10 09:26:56.746102724 -0300
+@@ -1270,6 +1270,8 @@
+ && command_line.rpath == NULL)
+ {
+ lib_path = (const char *) getenv ("LD_RUN_PATH");
++ if ((lib_path) && (strlen (lib_path) == 0))
++ lib_path = NULL;
+ if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ force))
+ break;
+@@ -1497,6 +1499,8 @@
+ rpath = command_line.rpath;
+ if (rpath == NULL)
+ rpath = (const char *) getenv ("LD_RUN_PATH");
++ if ((rpath) && (strlen (rpath) == 0))
++ rpath = NULL;
+
+ for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+ if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/package/binutils/binutils-2.23/500-sysroot.patch b/package/binutils/binutils-2.23/500-sysroot.patch
new file mode 100644
index 0000000..e49c795
--- /dev/null
+++ b/package/binutils/binutils-2.23/500-sysroot.patch
@@ -0,0 +1,37 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,25 @@
+ directory first. */
+ if (! entry->flags.maybe_archive)
+ {
+- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++ /* For absolute pathnames, try to always open the file in the
++ sysroot first. If this fails, try to open the file at the
++ given location. */
++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++ && ld_sysroot)
+ {
+ char *name = concat (ld_sysroot, entry->filename,
+ (const char *) NULL);
+ if (ldfile_try_open_bfd (name, entry))
+ {
+ entry->filename = name;
++ entry->flags.sysrooted = TRUE;
+ return TRUE;
+ }
+ free (name);
+ }
+- else if (ldfile_try_open_bfd (entry->filename, entry))
++
++ if (ldfile_try_open_bfd (entry->filename, entry))
+ return TRUE;
+
+ if (IS_ABSOLUTE_PATH (entry->filename))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCHv2] mpd: bump to version 0.17.2
From: Peter Korsgaard @ 2012-10-22 19:00 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909628-31561-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] libfuse: bump to version 2.9.2
From: Peter Korsgaard @ 2012-10-22 19:00 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909087-27325-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] libfuse: bump to version 2.9.2
From: Peter Korsgaard @ 2012-10-22 19:00 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=f048127f0345e2a4475cca0e91769c0fa92f4d42
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/libfuse/libfuse-iconv.patch | 18 ------------------
package/libfuse/libfuse.mk | 2 +-
2 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/package/libfuse/libfuse-iconv.patch b/package/libfuse/libfuse-iconv.patch
deleted file mode 100644
index 9f50032..0000000
--- a/package/libfuse/libfuse-iconv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream commit efeac22bfa65c845c04adb5e70e6de33b0104fa3 but without
-the need to autoreconf :)
-Fixes libiconv missing in fuse.pc
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura fuse-2.9.1/configure fuse-2.9.1.iconv/configure
---- fuse-2.9.1/configure 2012-07-19 09:53:29.000000000 -0300
-+++ fuse-2.9.1.iconv/configure 2012-09-07 08:47:57.834912620 -0300
-@@ -13237,7 +13237,7 @@
-
- fi
-
--libfuse_libs=$libfuse_libs $LTLIBICONV
-+libfuse_libs="$libfuse_libs $LTLIBICONV"
- if test "$am_cv_func_iconv" = yes; then
- ICONV_TRUE=
- ICONV_FALSE='#'
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 779115b..ccd49fe 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -4,7 +4,7 @@
#
#############################################################
-LIBFUSE_VERSION = 2.9.1
+LIBFUSE_VERSION = 2.9.2
LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
LIBFUSE_LICENSE = GPLv2 LGPLv2.1
^ permalink raw reply related
* [Buildroot] [git commit] mpd: bump to version 0.17.2
From: Peter Korsgaard @ 2012-10-22 18:59 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=6a814437498a0d1bc7f841657cc8f13e2f738a7a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/multimedia/mpd/mpd.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 28cb4d2..fb4c550 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
#
#############################################################
-MPD_VERSION = 0.17.1
+MPD_VERSION = 0.17.2
MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
MPD_DEPENDENCIES = host-pkg-config libglib2
MPD_LICENSE = GPLv2
^ permalink raw reply related
* [Buildroot] [git commit] openssl: disable apps for NOMMU
From: Peter Korsgaard @ 2012-10-22 18:53 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=720893b62510438237b9923d744dd079ddb4f67d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The openssl binary uses fork() so disable the option and build for !MMU.
Fixes
http://autobuild.buildroot.net/results/45a9b84c16caadbf77b6fc43d7a0001c981a4c87/build-end.log
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/openssl/Config.in | 2 ++
package/openssl/openssl.mk | 17 +++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 6ba644a..2187023 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -12,6 +12,8 @@ config BR2_PACKAGE_OPENSSL
config BR2_PACKAGE_OPENSSL_BIN
bool "openssl binary"
depends on BR2_PACKAGE_OPENSSL
+ # uses fork()
+ depends on BR2_USE_MMU
help
Install the openssl binary to the target file system. This is a
command line tool for doing various crypthographic stuff.
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 0917344..265a4fb 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -13,6 +13,15 @@ OPENSSL_DEPENDENCIES = zlib
OPENSSL_TARGET_ARCH = generic32
OPENSSL_CFLAGS = $(TARGET_CFLAGS)
+ifeq ($(BR2_PACKAGE_OPENSSL_BIN),)
+define OPENSSL_DISABLE_APPS
+ $(SED) '/^build_apps/! s/build_apps//' $(@D)/Makefile.org
+ $(SED) '/^DIRS=/ s/apps//' $(@D)/Makefile.org
+endef
+endif
+
+OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
+
ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
OPENSSL_DEPENDENCIES += ocf-linux
@@ -84,14 +93,6 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_DEV_FILES
endif
-define OPENSSL_REMOVE_OPENSSL_BIN
- rm -f $(TARGET_DIR)/usr/bin/openssl
-endef
-
-ifneq ($(BR2_PACKAGE_OPENSSL_BIN),y)
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_BIN
-endif
-
define OPENSSL_INSTALL_FIXUPS
rm -f $(TARGET_DIR)/usr/bin/c_rehash
endef
^ permalink raw reply related
* [Buildroot] [PATCHv2] openssl: disable apps for NOMMU
From: Peter Korsgaard @ 2012-10-22 18:53 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350920528-20247-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> The openssl binary uses fork() so disable the option and build for !MMU.
Gustavo> Fixes
Gustavo> http://autobuild.buildroot.net/results/45a9b84c16caadbf77b6fc43d7a0001c981a4c87/build-end.log
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCHv2] openssl: disable apps for NOMMU
From: Gustavo Zacarias @ 2012-10-22 15:42 UTC (permalink / raw)
To: buildroot
The openssl binary uses fork() so disable the option and build for !MMU.
Fixes
http://autobuild.buildroot.net/results/45a9b84c16caadbf77b6fc43d7a0001c981a4c87/build-end.log
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/openssl/Config.in | 2 ++
package/openssl/openssl.mk | 17 +++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 6ba644a..2187023 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -12,6 +12,8 @@ config BR2_PACKAGE_OPENSSL
config BR2_PACKAGE_OPENSSL_BIN
bool "openssl binary"
depends on BR2_PACKAGE_OPENSSL
+ # uses fork()
+ depends on BR2_USE_MMU
help
Install the openssl binary to the target file system. This is a
command line tool for doing various crypthographic stuff.
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 0917344..265a4fb 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -13,6 +13,15 @@ OPENSSL_DEPENDENCIES = zlib
OPENSSL_TARGET_ARCH = generic32
OPENSSL_CFLAGS = $(TARGET_CFLAGS)
+ifeq ($(BR2_PACKAGE_OPENSSL_BIN),)
+define OPENSSL_DISABLE_APPS
+ $(SED) '/^build_apps/! s/build_apps//' $(@D)/Makefile.org
+ $(SED) '/^DIRS=/ s/apps//' $(@D)/Makefile.org
+endef
+endif
+
+OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
+
ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
OPENSSL_DEPENDENCIES += ocf-linux
@@ -84,14 +93,6 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_DEV_FILES
endif
-define OPENSSL_REMOVE_OPENSSL_BIN
- rm -f $(TARGET_DIR)/usr/bin/openssl
-endef
-
-ifneq ($(BR2_PACKAGE_OPENSSL_BIN),y)
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_BIN
-endif
-
define OPENSSL_INSTALL_FIXUPS
rm -f $(TARGET_DIR)/usr/bin/c_rehash
endef
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH] openssl: disable apps for NOMMU
From: Gustavo Zacarias @ 2012-10-22 15:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <873917sh5n.fsf@macbook.be.48ers.dk>
On 10/21/12 17:29, Peter Korsgaard wrote:
> Ok, but why only on !MMU and not when the user has just decided that
> they don't want /usr/bin/openssl (E.G. not enable
> BR2_PACKAGE_OPENSSL_BIN)? Why would we want to build (but not install)
> it when MMU?
No reason in particular, i was just fixing the bug without considering
tidying other things up.
It will save some glorious 2 seconds of build time when !BIN, but why not?
Regards.
^ permalink raw reply
* [Buildroot] About remote debugging and library stripping
From: Thomas Petazzoni @ 2012-10-22 15:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121022144411.GA10398@mail.sceen.net>
On Mon, 22 Oct 2012 16:44:11 +0200, Richard Braun wrote:
> On Sun, Oct 21, 2012 at 08:27:19PM +0200, Thomas Petazzoni wrote:
> > Can you conclude with what you think are the steps needed to get these
> > things right?
>
> First, fix the crosstool-ng backend so that libthread_db gets installed.
> The minimal Linux support in gdbserver can lead to serious headaches, so
> it's really better to have this library present in the rootfs.
Ok.
> An option could be added that would govern the installation of
> libthread_db for people who are looking for a truely minimalist rootfs
> and don't intend to debug.
I am not sure what happens with the Crosstool-NG when one enables
BR2_PACKAGE_GDB_SERVER and/or BR2_PACKAGE_GDB_HOST. But I guess we
should copy libthread_db to the target only if BR2_PACKAGE_GDB_SERVER
is enabled, i.e if gdbserver is actually installed on the target.
*But*, to keep things consistent, we should also do the same with the
external toolchain backend, i.e only install libthread_db if
BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY is enabled. At the moment, the
ext-tool.mk is installing libthread_db on the target only if
BR2_PACKAGE_GDB_SERVER is enabled, which is silly because this option
is not visible in the external toolchain backend case (we assume that
both cross-gdb and gdbserver are provided by the external toolchain).
> Next, strip libpthread using --strip-debug, and *not* --strip-unneeded,
> although this is purely to make sure debugging will work, as the
> requirement to keep some local symbols also depends on the libc and the
> target, and there are sufficiently few such symbols to consider the
> overhead completely negligible (although it could also depend on the
> aforementioned option).
>
> If noone works on this, I'll submit a patch when I can make some time
> for it.
Ok.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] About remote debugging and library stripping
From: Richard Braun @ 2012-10-22 14:44 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121021202719.6c7e0a5d@skate>
On Sun, Oct 21, 2012 at 08:27:19PM +0200, Thomas Petazzoni wrote:
> Can you conclude with what you think are the steps needed to get these
> things right?
First, fix the crosstool-ng backend so that libthread_db gets installed.
The minimal Linux support in gdbserver can lead to serious headaches, so
it's really better to have this library present in the rootfs.
An option could be added that would govern the installation of
libthread_db for people who are looking for a truely minimalist rootfs
and don't intend to debug.
Next, strip libpthread using --strip-debug, and *not* --strip-unneeded,
although this is purely to make sure debugging will work, as the
requirement to keep some local symbols also depends on the libc and the
target, and there are sufficiently few such symbols to consider the
overhead completely negligible (although it could also depend on the
aforementioned option).
If noone works on this, I'll submit a patch when I can make some time
for it.
--
Richard Braun
^ permalink raw reply
* [Buildroot] [Bug 3631] Error while compiling with Xorg
From: bugzilla at busybox.net @ 2012-10-22 14:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-3631-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=3631
--- Comment #6 from Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2012-10-22 14:18:30 UTC ---
Here, xdriver_xf86-video-fbdev-0.4.2 builds just fine. It selects the
xorg-xserver package, so it should be built as a dependency correctly.
Can you please post your Buildroot .config file as you suggested, and confirm
that you can reproduce this problem from a completely clean Buildroot build
(i.e after running "make clean; make") ?
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 3631] Error while compiling with Xorg
From: bugzilla at busybox.net @ 2012-10-22 13:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-3631-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=3631
--- Comment #5 from Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2012-10-22 13:36:18 UTC ---
Please attach your Buildroot .config file to this bug report. Thanks!
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [PATCH 04/12] libnetfilter_cthelper: add new package
From: Thomas Petazzoni @ 2012-10-22 13:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909989-1012-4-git-send-email-gustavo@zacarias.com.ar>
On Mon, 22 Oct 2012 09:46:21 -0300, Gustavo Zacarias wrote:
> --- /dev/null
> +++ b/package/libnetfilter_cthelper/Config.in
> @@ -0,0 +1,11 @@
> +config BR2_PACKAGE_LIBNETFILTER_CTHELPER
> + bool "libnetfilter_cthelper"
> + depends on BR2_LARGEFILE
> + select BR2_PACKAGE_LIBMNL
> + help
> + libnetfilter_cthelper is the userspace library that provides the programming interface to the user-space helper infrastructure available since Linux kernel 3.6.
Line wrapping needed.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 12/12] arptables: add new package
From: Gustavo Zacarias @ 2012-10-22 12:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909989-1012-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 1 +
package/arptables/Config.in | 6 ++++++
package/arptables/arptables.mk | 21 +++++++++++++++++++++
3 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 package/arptables/Config.in
create mode 100644 package/arptables/arptables.mk
diff --git a/package/Config.in b/package/Config.in
index 7c29ef3..5cbebbc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -540,6 +540,7 @@ endmenu
menu "Networking applications"
source "package/argus/Config.in"
+source "package/arptables/Config.in"
source "package/avahi/Config.in"
source "package/axel/Config.in"
source "package/bluez_utils/Config.in"
diff --git a/package/arptables/Config.in b/package/arptables/Config.in
new file mode 100644
index 0000000..510eedf
--- /dev/null
+++ b/package/arptables/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ARPTABLES
+ bool "arptables"
+ help
+ Tool to set up, maintain, and inspect the tables of ARP rules.
+
+ http://ebtables.sourceforge.net
diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk
new file mode 100644
index 0000000..dac5ca4
--- /dev/null
+++ b/package/arptables/arptables.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# arptables
+#
+#############################################################
+
+ARPTABLES_VERSION = 0.0.3
+ARPTABLES_VERSION_MINOR = 4
+ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION)-$(ARPTABLES_VERSION_MINOR).tar.gz
+ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION)
+
+define ARPTABLES_BUILD_CMDS
+ $(MAKE) -C $(@D) \
+ CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)"
+endef
+
+define ARPTABLES_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 755 -D $(@D)/arptables $(TARGET_DIR)/usr/sbin/arptables
+endef
+
+$(eval $(generic-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 11/12] ulogd: add new package
From: Gustavo Zacarias @ 2012-10-22 12:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909989-1012-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 1 +
package/ulogd/Config.in | 16 +++++++++++
package/ulogd/ulogd-fix-libpcap-conditional.patch | 29 +++++++++++++++++++++
package/ulogd/ulogd.mk | 17 ++++++++++++
4 files changed, 63 insertions(+), 0 deletions(-)
create mode 100644 package/ulogd/Config.in
create mode 100644 package/ulogd/ulogd-fix-libpcap-conditional.patch
create mode 100644 package/ulogd/ulogd.mk
diff --git a/package/Config.in b/package/Config.in
index a50eb33..7c29ef3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -643,6 +643,7 @@ source "package/tn5250/Config.in"
source "package/transmission/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
+source "package/ulogd/Config.in"
source "package/ushare/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
new file mode 100644
index 0000000..7dc4f11
--- /dev/null
+++ b/package/ulogd/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_ULOGD
+ bool "ulogd"
+ depends on BR2_INET_IPV6
+ depends on BR2_LARGEFILE
+ select BR2_PACKAGE_LIBMNL
+ select BR2_PACKAGE_LIBNETFILTER_ACCT
+ select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+ select BR2_PACKAGE_LIBNETFILTER_LOG
+ select BR2_PACKAGE_LIBNFNETLINK
+ help
+ ulogd is a userspace logging daemon for netfilter/iptables related logging.
+
+ http://www.netfilter.org/projects/ulogd/
+
+comment "ulogd requires a toolchain with IPV6 and LARGEFILE support"
+ depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
diff --git a/package/ulogd/ulogd-fix-libpcap-conditional.patch b/package/ulogd/ulogd-fix-libpcap-conditional.patch
new file mode 100644
index 0000000..3d73d37
--- /dev/null
+++ b/package/ulogd/ulogd-fix-libpcap-conditional.patch
@@ -0,0 +1,29 @@
+From 08387386821f356834bac14c7c5ea7296fb0f428 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 9 Oct 2012 16:23:12 -0300
+Subject: [PATCH] autoconf/ulogd: fix broken libpcap AM_CONDITIONAL
+
+The AM_CONDITIONAL lacks the opening bracket, hence it always evaluates
+as true, even if there's no libpcap found thus causing build breakage.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 10b6e1f..57c596c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
+ AC_SUBST([libdl_LIBS])
+ AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
+ AC_SUBST([libpcap_LIBS])
+-AM_CONDITIONAL([HAVE_PCAP], test -n "$libpcap_LIBS"])
++AM_CONDITIONAL([HAVE_PCAP],[test -n "$libpcap_LIBS"])
+
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+--
+1.7.8.6
+
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
new file mode 100644
index 0000000..88dc88a
--- /dev/null
+++ b/package/ulogd/ulogd.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# ulogd
+#
+#############################################################
+
+ULOGD_VERSION = 2.0.1
+ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
+ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
+ULOGD_AUTORECONF = YES
+ULOGD_DEPENDENCIES = host-pkg-config \
+ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
+ libnfnetlink
+ULOGD_LICENSE = GPLv2
+ULOGD_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 10/12] conntrack-tools: bump to version 1.4.0
From: Gustavo Zacarias @ 2012-10-22 12:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909989-1012-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/conntrack-tools/Config.in | 7 +++++--
package/conntrack-tools/conntrack-tools.mk | 5 +++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index be491e6..f109adf 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -1,9 +1,12 @@
config BR2_PACKAGE_CONNTRACK_TOOLS
bool "conntrack-tools"
depends on BR2_INET_IPV6
+ depends on BR2_INET_RPC
depends on BR2_LARGEFILE
select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+ select BR2_PACKAGE_LIBNETFILTER_CTHELPER
select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
+ select BR2_PACKAGE_LIBNETFILTER_QUEUE
help
The conntrack-tools are a set of tools targeted at
system administrators.
@@ -12,5 +15,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
http://www.netfilter.org/projects/conntrack-tools/
-comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
- depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
+comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and RPC support"
+ depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_INET_RPC
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 6f438fc..2249a49 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,11 +4,12 @@
#
#############################################################
-CONNTRACK_TOOLS_VERSION = 1.2.2
+CONNTRACK_TOOLS_VERSION = 1.4.0
CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \
- libnetfilter_conntrack libnetfilter_cttimeout
+ libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
+ libnetfilter_queue
CONNTRACK_TOOLS_LICENSE = GPLv2
CONNTRACK_TOOLS_LICENSE_FILES = COPYING
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 09/12] nfacct: add new package
From: Gustavo Zacarias @ 2012-10-22 12:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909989-1012-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 1 +
package/nfacct/Config.in | 12 ++++++++++++
package/nfacct/nfacct.mk | 15 +++++++++++++++
3 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 package/nfacct/Config.in
create mode 100644 package/nfacct/nfacct.mk
diff --git a/package/Config.in b/package/Config.in
index c2ff2d5..a50eb33 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -603,6 +603,7 @@ source "package/netplug/Config.in"
source "package/netsnmp/Config.in"
source "package/netstat-nat/Config.in"
source "package/network-manager/Config.in"
+source "package/nfacct/Config.in"
source "package/noip/Config.in"
source "package/ngircd/Config.in"
source "package/ngrep/Config.in"
diff --git a/package/nfacct/Config.in b/package/nfacct/Config.in
new file mode 100644
index 0000000..ac437da
--- /dev/null
+++ b/package/nfacct/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_NFACCT
+ bool "nfacct"
+ depends on BR2_LARGEFILE
+ select BR2_PACKAGE_LIBNETFILTER_ACCT
+ help
+ nfacct is the command line tool to create/retrieve/delete
+ netfilter accounting objects.
+
+ http://www.netfilter.org/projects/nfacct/
+
+comment "nfacct requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk
new file mode 100644
index 0000000..4f92482
--- /dev/null
+++ b/package/nfacct/nfacct.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# nfacct
+#
+#############################################################
+
+NFACCT_VERSION = 1.0.0
+NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2
+NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files
+NFACCT_DEPENDENCIES = host-pkg-config \
+ libnetfilter_acct
+NFACCT_LICENSE = GPLv2
+NFACCT_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 08/12] libnetfilter_log: add new package
From: Gustavo Zacarias @ 2012-10-22 12:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909989-1012-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 1 +
package/libnetfilter_log/Config.in | 8 ++++++++
package/libnetfilter_log/libnetfilter-log.mk | 15 +++++++++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 package/libnetfilter_log/Config.in
create mode 100644 package/libnetfilter_log/libnetfilter-log.mk
diff --git a/package/Config.in b/package/Config.in
index 8a8af71..c2ff2d5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -449,6 +449,7 @@ source "package/libnetfilter_acct/Config.in"
source "package/libnetfilter_conntrack/Config.in"
source "package/libnetfilter_cthelper/Config.in"
source "package/libnetfilter_cttimeout/Config.in"
+source "package/libnetfilter_log/Config.in"
source "package/libnetfilter_queue/Config.in"
source "package/libnfnetlink/Config.in"
source "package/libnl/Config.in"
diff --git a/package/libnetfilter_log/Config.in b/package/libnetfilter_log/Config.in
new file mode 100644
index 0000000..927cd0a
--- /dev/null
+++ b/package/libnetfilter_log/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBNETFILTER_LOG
+ bool "libnetfilter_log"
+ select BR2_PACKAGE_LIBNFNETLINK
+ help
+ libnetfilter_log is a userspace library providing interface
+ to packets that have been logged by the kernel packet filter.
+
+ http://www.netfilter.org/projects/libnetfilter_log/
diff --git a/package/libnetfilter_log/libnetfilter-log.mk b/package/libnetfilter_log/libnetfilter-log.mk
new file mode 100644
index 0000000..f72a641
--- /dev/null
+++ b/package/libnetfilter_log/libnetfilter-log.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libnetfilter-log
+#
+#############################################################
+
+LIBNETFILTER_LOG_VERSION = 1.0.1
+LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2
+LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files
+LIBNETFILTER_LOG_INSTALL_STAGING = YES
+LIBNETFILTER_LOG_DEPENDENCIES = host-pkg-config libnfnetlink
+LIBNETFILTER_LOG_LICENSE = GPLv2
+LIBNETFILTER_LOG_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 07/12] libmnl: add license info
From: Gustavo Zacarias @ 2012-10-22 12:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350909989-1012-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/libmnl/libmnl.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 75bb238..1f71347 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -8,5 +8,7 @@ LIBMNL_VERSION = 1.0.3
LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
LIBMNL_INSTALL_STAGING = YES
+LIBMNL_LICENSE = LGPLv2.1+
+LIBMNL_LICENSE_FILES = COPYING
$(eval $(autotools-package))
--
1.7.8.6
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox