From a83b5b3bebd199cc77d991e4e3b3bac7010c6ffb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 19 Nov 2015 09:39:46 +0100 Subject: [PATCH] pkg-config: update to pkg-config-0.29 Signed-off-by: Stephan Raue --- packages/devel/pkg-config/package.mk | 4 +-- .../patches/pkg-config-01_rebuild.patch | 26 ------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 packages/devel/pkg-config/patches/pkg-config-01_rebuild.patch diff --git a/packages/devel/pkg-config/package.mk b/packages/devel/pkg-config/package.mk index 4eff86271a..db27936901 100644 --- a/packages/devel/pkg-config/package.mk +++ b/packages/devel/pkg-config/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pkg-config" -PKG_VERSION="0.28" +PKG_VERSION="0.29" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -38,5 +38,5 @@ PKG_CONFIGURE_OPTS_HOST="--disable-silent-rules \ post_makeinstall_host() { mkdir -p $SYSROOT_PREFIX/usr/share/aclocal - cp ../pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal + cp pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal } diff --git a/packages/devel/pkg-config/patches/pkg-config-01_rebuild.patch b/packages/devel/pkg-config/patches/pkg-config-01_rebuild.patch deleted file mode 100644 index 32990eecc7..0000000000 --- a/packages/devel/pkg-config/patches/pkg-config-01_rebuild.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 41e48e8..7178ec8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,7 +39,7 @@ pkg_config_SOURCES= \ - if HOST_TOOL - host_tool = $(host)-pkg-config$(EXEEXT) - install-exec-hook: -- cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool) -+ cd $(DESTDIR)$(bindir) && rm -f $(host_tool) && $(LN) pkg-config$(EXEEXT) $(host_tool) - uninstall-hook: - cd $(DESTDIR)$(bindir) && rm -f $(host_tool) - endif -diff --git a/Makefile.in b/Makefile.in -index a1ad77c..88a421c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1093,7 +1093,7 @@ uninstall-man: uninstall-man1 - uninstall-man1 - - @HOST_TOOL_TRUE@install-exec-hook: --@HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool) -+@HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && rm -f $(host_tool) && $(LN) pkg-config$(EXEEXT) $(host_tool) - @HOST_TOOL_TRUE@uninstall-hook: - @HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && rm -f $(host_tool) -