diff --git a/packages/toolchain/devel/pkg-config/build b/packages/toolchain/devel/pkg-config/build index d71c51c390..2cfb88571e 100755 --- a/packages/toolchain/devel/pkg-config/build +++ b/packages/toolchain/devel/pkg-config/build @@ -22,6 +22,9 @@ . config/options $1 +export GLIB_CFLAGS="-I$ROOT/$TOOLCHAIN/include/glib-2.0 -I$ROOT/$TOOLCHAIN/lib/glib-2.0/include" +export GLIB_LIBS="-L$ROOT/$TOOLCHAIN/lib -lglib-2.0" + setup_toolchain host cd $PKG_BUILD diff --git a/packages/toolchain/devel/pkg-config/meta b/packages/toolchain/devel/pkg-config/meta index 49447fefa7..5e9565196b 100644 --- a/packages/toolchain/devel/pkg-config/meta +++ b/packages/toolchain/devel/pkg-config/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="pkg-config" -PKG_VERSION="0.25" +PKG_VERSION="0.26" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/software/pkgconfig/" PKG_URL="http://pkgconfig.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache" +PKG_BUILD_DEPENDS="ccache glib-host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="pkg-config: A library configuration management system" diff --git a/packages/toolchain/devel/pkg-config/patches/pkg-config-0.25-m4_pattern_allow.patch b/packages/toolchain/devel/pkg-config/patches/pkg-config-0.25-m4_pattern_allow.patch deleted file mode 100644 index 7613fe0268..0000000000 --- a/packages/toolchain/devel/pkg-config/patches/pkg-config-0.25-m4_pattern_allow.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur pkg-config-0.25-old/pkg.m4 pkg-config-0.25-new/pkg.m4 ---- pkg-config-0.25-old/pkg.m4 2009-12-06 12:39:02.000000000 -0800 -+++ pkg-config-0.25-new/pkg.m4 2010-05-28 16:55:19.000000000 -0700 -@@ -26,7 +26,15 @@ - # ---------------------------------- - AC_DEFUN([PKG_PROG_PKG_CONFIG], - [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) --m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+m4_pattern_allow([^PKG_CONFIG$]) -+m4_pattern_allow([^PKG_CONFIG_ALLOW_SYSTEM_CFLAGS$]) -+m4_pattern_allow([^PKG_CONFIG_ALLOW_SYSTEM_LIBS$]) -+m4_pattern_allow([^PKG_CONFIG_DEBUG_SPEW$]) -+m4_pattern_allow([^PKG_CONFIG_DISABLE_UNINSTALLED$]) -+m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) -+m4_pattern_allow([^PKG_CONFIG_PATH$]) -+m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) -+m4_pattern_allow([^PKG_CONFIG_TOP_BUILD_DIR$]) - AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) - AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) - AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])