diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-11-23 23:02:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-11-23 23:02:40 +0000 |
| commit | 43fe09ee77e73944d29805ff2eb266614b570708 (patch) | |
| tree | 23aa5ce1d15004adb4e72484d8452efb58bdb3c2 | |
| parent | 86605d34c42ebc77651cdd1c757ba103da00f3fd (diff) | |
| download | upstream-43fe09ee77e73944d29805ff2eb266614b570708.tar.gz upstream-43fe09ee77e73944d29805ff2eb266614b570708.tar.bz2 upstream-43fe09ee77e73944d29805ff2eb266614b570708.zip | |
CC: tools/pkg-config: update to 0.29
backport of r47300
Release announcement:
http://lists.freedesktop.org/archives/pkg-config/2015-September/001019.html
Drop patches, as they have been implemented upstream.
This also fixes a build problem in the glib configure script when the
user id is bigger than 2^21 - 1.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Felix Fietkau <nbd@openwrt.org> [fix OSX compatibility]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47608 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | tools/pkg-config/Makefile | 10 | ||||
| -rw-r--r-- | tools/pkg-config/patches/001-fix-package-rebuild.patch | 22 | ||||
| -rw-r--r-- | tools/pkg-config/patches/002-musl_host_fixup.patch | 24 |
3 files changed, 7 insertions, 49 deletions
diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile index 9a1b3fb986..40e6e083e8 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 @@ -21,6 +21,10 @@ unexport PKG_CONFIG HOST_CONFIGURE_ARGS += --with-internal-glib +ifeq ($(HOST_OS),Darwin) +HOST_LDFLAGS += -framework CoreFoundation -framework Carbon +endif + define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real 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 54f549c076..0000000000 --- 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@install-exec-hook: --@HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool) -+@HOST_TOOL_TRUE@ cd $(DESTDIR)$(bindir) && $(LN) -f pkg-config$(EXEEXT) $(host_tool) - @HOST_TOOL_TRUE@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 d39a738339..0000000000 --- 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* \ |