[OpenWrt-Devel] [PATCH] tools/pkg-config: update to 0.29
Hannu Nyman
hannu.nyman at iki.fi
Mon Oct 26 14:14:27 EDT 2015
Update pkg-config to version 0.29.
Release announcement:
http://lists.freedesktop.org/archives/pkg-config/2015-September/001019.html
Drop patches, as they have been implemented upstream.
Signed-off-by: Hannu Nyman <hannu.nyman at iki.fi>
---
pkg-config 0.29
===
- Fixed a regression from 0.28 in system -L flag handling. If the pc
file has multiple system -L flags, every other flag will be left as
is. Thanks to Andrew Oakley for the fix. (#78077)
- Quoting of variables queried through --variable is removed so that the
output can be used verbatim in subsequent shell commands. Thanks to
Marek Kasik for the fix. (#67904)
- Fixed a regression from 0.28 in -L flag handling on Windows. A .libs
suffix was inadvertantly being added to the library path.
- Added a --validate option to check pc file syntax. This works just
like --exists, but package dependencies are disabled. (#7000)
- Added the PKG_PREREQ autoconf macro. Whereas PKG_PROG_PKG_CONFIG is
used to check the version of the pkg-config tool, this is used to
check the version of the pkg-config autoconf macros in use.
- Added the PKG_CHECK_MODULES_STATIC autoconf macro. This will
temporarily add --static to the pkg-config calls while invoking
PKG_CHECK_MODULES. (#19541)
- Many fixes to the testsuite for Windows. It should now pass for a
MinGW, Cygwin, and cross-compiled MinGW using Wine for test execution.
(#66939)
- More consistent handling of prefix redefinition. On Windows, the
prefix was always being redefined based on the pc file path. This
feature can now be enabled or disabled at runtime on all platforms
using the --define-prefix and --dont-define-prefix options. (#63602)
- Continue listing packages with --list-all even if there are errors in
pc files. (#26615)
- Various documentation improvements. (#62018, #62374, #66155)
- Fixed a bug when multiple -isystem arguments are used. (#72584)
- pkg-config is now built with largefile support to ensure that it works
correctly on filesystems with 64 bit inodes. Thanks to Peter Jones for
the fix. (#90078)
- Bugs fixed: 7000, 19541, 26615, 62018, 62374, 63602, 66155, 66939,
67904, 70690, 72584, 78077, 80378, 80380, 89267, 90078, 90437, 92002.
Upstream changes related to the patch removal:
001-fix-package-rebuild.patch / ln -f flag:
http://cgit.freedesktop.org/pkg-config/commit/Makefile.am?id=d377ee6b740373895cb67cdc14a98c0d71650e05
002-musl_host_fixup.patch / musl support in config.sub:
http://git.savannah.gnu.org/gitweb/?p=config.git;a=commitdiff;h=062587eaa891396c936555ae51f7e77eeb71a5fe;hp=6f8e28fb9ea09326683bfff0da17c8e0218145da
---
tools/pkg-config/Makefile | 6 +++---
.../patches/001-fix-package-rebuild.patch | 22 --------------------
tools/pkg-config/patches/002-musl_host_fixup.patch | 24 ----------------------
3 files changed, 3 insertions(+), 49 deletions(-)
delete mode 100644 tools/pkg-config/patches/001-fix-package-rebuild.patch
delete mode 100644 tools/pkg-config/patches/002-musl_host_fixup.patch
diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile
index 9a1b3fb..2ac3cb8 100644
--- a/tools/pkg-config/Makefile
+++ b/tools/pkg-config/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=pkg-config
-PKG_VERSION:=0.28
+PKG_VERSION:=0.29
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://pkgconfig.freedesktop.org/releases/
-PKG_MD5SUM:=aa3c86e67551adc3ac865160e34a2a0d
+PKG_MD5SUM:=77f27dce7ef88d0634d0d6f90e03a77f
HOST_BUILD_PARALLEL:=1
diff --git a/tools/pkg-config/patches/001-fix-package-rebuild.patch b/tools/pkg-config/patches/001-fix-package-rebuild.patch
deleted file mode 100644
index 54f549c..0000000
--- a/tools/pkg-config/patches/001-fix-package-rebuild.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -39,7 +39,7 @@
- if HOST_TOOL
- host_tool = $(host)-pkg-config$(EXEEXT)
- install-exec-hook:
-- cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool)
-+ cd $(DESTDIR)$(bindir) && $(LN) -f pkg-config$(EXEEXT) $(host_tool)
- uninstall-hook:
- cd $(DESTDIR)$(bindir) && rm -f $(host_tool)
- endif
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1093,7 +1093,7 @@
- uninstall-man1
-
- @HOST_TOOL_TRUE at install-exec-hook:
-- at HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool)
-+ at HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && $(LN) -f pkg-config$(EXEEXT) $(host_tool)
- @HOST_TOOL_TRUE at uninstall-hook:
- @HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && rm -f $(host_tool)
-
diff --git a/tools/pkg-config/patches/002-musl_host_fixup.patch b/tools/pkg-config/patches/002-musl_host_fixup.patch
deleted file mode 100644
index d39a738..0000000
--- a/tools/pkg-config/patches/002-musl_host_fixup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/glib/config.sub
-+++ b/glib/config.sub
-@@ -122,9 +122,9 @@ esac
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-- knetbsd*-gnu* | netbsd*-gnu* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-musl* | \
-+ linux-newlib* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1354,7 +1354,7 @@ case $os in
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
-- | -linux-newlib* | -linux-uclibc* \
-+ | -linux-musl* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--
2.5.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list