21184391 Update pkg-config to 0.29
authorStacy Yeh <stacy.yeh@oracle.com>
Tue, 02 Feb 2016 16:00:39 -0800
changeset 5392 2cf37adf29cf
parent 5391 5aa4a8c4577f
child 5395 a3366751f9c6
21184391 Update pkg-config to 0.29
components/pkg-config/Makefile
components/pkg-config/patches/0001-manpage.patch
components/pkg-config/pkg-config.p5m
components/pkg-config/test/results-64.master
--- a/components/pkg-config/Makefile	Tue Feb 02 13:47:41 2016 -0800
+++ b/components/pkg-config/Makefile	Tue Feb 02 16:00:39 2016 -0800
@@ -20,22 +20,23 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pkg-config
-COMPONENT_VERSION=	0.23
+COMPONENT_VERSION=	0.29
 COMPONENT_PROJECT_URL=	http://www.freedesktop.org/wiki/Software/pkg-config
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53
+    sha256:c8507705d2a10c67f385d66ca2aae31e81770cc0734b4191eb8c489e864a006b
 COMPONENT_ARCHIVE_URL=	http://pkgconfig.freedesktop.org/releases/$(COMPONENT_ARCHIVE)
+COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).asc
 COMPONENT_BUGDB=	utility/pkg-config
 
-TPNO=			9421
+TPNO=			26453
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -72,5 +73,5 @@
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-
+REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += system/library
--- a/components/pkg-config/patches/0001-manpage.patch	Tue Feb 02 13:47:41 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-This patch fixes the manpage so it displays properly on Solaris.  Without this
-patch, the "mak pkg-config" command shows no output.
---- pkg-config-0.23/pkg-config.1-orig	2013-07-08 01:48:06.890795558 -0500
-+++ pkg-config-0.23/pkg-config.1	2013-07-08 01:50:15.263772090 -0500
[email protected]@ -2,27 +2,7 @@
- .\" pkg-config manual page.
- .\" (C) Red Hat, Inc. based on gnome-config man page (C) Miguel de Icaza ([email protected])
- .\"
--.
--.\" Macros to disable groff line adjustment warnings that we can't easily
--.\" fix in the text.
--.ie \n(.g \{\
--.  de DW
--.    nr .oldwarn \n[.warn]
--.    warn 0
--.  .
--.  de EW
--.    warn \n[.oldwarn]
--.  .
--.\}
--.el \
--.\{ \
--.  de DW
--.  .
--.  de EW
--.  .
--.\}
--.
--.TH pkg-config 1
-+.TH pkg-config 1 "7 Jul 2013"
- .SH NAME
- pkg-config \- Return metainformation about installed libraries
- .SH SYNOPSIS
--- a/components/pkg-config/pkg-config.p5m	Tue Feb 02 13:47:41 2016 -0800
+++ b/components/pkg-config/pkg-config.p5m	Tue Feb 02 16:00:39 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -40,6 +40,7 @@
 dir  path=usr/lib/$(MACH64)/pkgconfig group=other
 dir  path=usr/lib/pkgconfig group=other
 file path=usr/share/aclocal/pkg.m4
+file path=usr/share/doc/pkg-config/pkg-config-guide.html
 file path=usr/share/man/man1/pkg-config.1
 dir  path=usr/share/pkgconfig
 license pkg-config.license license=GPLv2
--- a/components/pkg-config/test/results-64.master	Tue Feb 02 13:47:41 2016 -0800
+++ b/components/pkg-config/test/results-64.master	Tue Feb 02 16:00:39 2016 -0800
@@ -1,103 +1,40 @@
-make[1]: Entering directory `$(@D)'
-Making check in glib-1.2.10
-make[2]: Entering directory `$(@D)/glib-1.2.10'
-/usr/gnu/bin/make  check-recursive
-make[3]: Entering directory `$(@D)/glib-1.2.10'
+make[1]: Entering directory '$(@D)'
 Making check in .
-make[4]: Entering directory `$(@D)/glib-1.2.10'
-make[4]: Leaving directory `$(@D)/glib-1.2.10'
-Making check in gmodule
-make[4]: Entering directory `$(@D)/glib-1.2.10/gmodule'
-/usr/gnu/bin/make  check-am
-make[5]: Entering directory `$(@D)/glib-1.2.10/gmodule'
-make[5]: Nothing to be done for `check-am'.
-make[5]: Leaving directory `$(@D)/glib-1.2.10/gmodule'
-make[4]: Leaving directory `$(@D)/glib-1.2.10/gmodule'
-Making check in gthread
-make[4]: Entering directory `$(@D)/glib-1.2.10/gthread'
-make[4]: Nothing to be done for `check'.
-make[4]: Leaving directory `$(@D)/glib-1.2.10/gthread'
-Making check in docs
-make[4]: Entering directory `$(@D)/glib-1.2.10/docs'
-make[4]: Nothing to be done for `check'.
-make[4]: Leaving directory `$(@D)/glib-1.2.10/docs'
-Making check in tests
-make[4]: Entering directory `$(@D)/glib-1.2.10/tests'
+make[2]: Entering directory '$(@D)'
+make[2]: Leaving directory '$(@D)'
+Making check in check
+make[2]: Entering directory '$(@D)/check'
 /usr/gnu/bin/make  check-TESTS
-make[5]: Entering directory `$(@D)/glib-1.2.10/tests'
-PASS: array-test
-PASS: dirname-test
-PASS: hash-test
-PASS: list-test
-PASS: node-test
-PASS: relation-test
-PASS: slist-test
-PASS: string-test
-PASS: strfunc-test
-PASS: tree-test
-PASS: type-test
-===================
-All 11 tests passed
-===================
-make[5]: Leaving directory `$(@D)/glib-1.2.10/tests'
-make[4]: Leaving directory `$(@D)/glib-1.2.10/tests'
-make[3]: Leaving directory `$(@D)/glib-1.2.10'
-make[2]: Leaving directory `$(@D)/glib-1.2.10'
-Making check in check
-make[2]: Entering directory `$(@D)/check'
-/usr/gnu/bin/make  check-TESTS
-make[3]: Entering directory `$(@D)/check'
+make[3]: Entering directory '$(@D)/check'
 PASS: check-cflags
 PASS: check-libs
+PASS: check-mixed-flags
+PASS: check-non-l-flags
 PASS: check-define-variable
 PASS: check-libs-private
-+ ARGS='--cflags requires-test'
-+ RESULT='-I/requires-test/include -I/private-dep/include -I/public-dep/include'
-+ run_test
-+ ../pkg-config --cflags requires-test
-+ 1> /dev/null 2>& 1
-+ [ 0 -ne 0 ]
-+ ../pkg-config --cflags requires-test
-+ R='-I/requires-test/include -I/private-dep/include -I/public-dep/include'
-+ [ '-I/requires-test/include -I/private-dep/include -I/public-dep/include' '!=' '-I/requires-test/include -I/private-dep/include -I/public-dep/include' ]
-+ return
-+ ARGS='--static --cflags requires-test'
-+ RESULT='-I/requires-test/include -I/private-dep/include -I/public-dep/include'
-+ run_test
-+ ../pkg-config --static --cflags requires-test
-+ 1> /dev/null 2>& 1
-+ [ 0 -ne 0 ]
-+ ../pkg-config --static --cflags requires-test
-+ R='-I/requires-test/include -I/private-dep/include -I/public-dep/include'
-+ [ '-I/requires-test/include -I/private-dep/include -I/public-dep/include' '!=' '-I/requires-test/include -I/private-dep/include -I/public-dep/include' ]
-+ return
-+ ARGS='--libs requires-test'
-+ RESULT='-L/requires-test/lib -L/public-dep/lib -lrequires-test -lpublic-dep'
-+ run_test
-+ ../pkg-config --libs requires-test
-+ 1> /dev/null 2>& 1
-+ [ 0 -ne 0 ]
-+ ../pkg-config --libs requires-test
-+ R='-L/requires-test/lib -L/public-dep/lib -lrequires-test -lpublic-dep'
-+ [ '-L/requires-test/lib -L/public-dep/lib -lrequires-test -lpublic-dep' '!=' '-L/requires-test/lib -L/public-dep/lib -lrequires-test -lpublic-dep' ]
-+ return
-+ ARGS='--static --libs requires-test'
-+ RESULT='-L/requires-test/lib -L/private-dep/lib -L/public-dep/lib -lrequires-test -lprivate-dep -lpublic-dep'
-+ run_test
-+ ../pkg-config --static --libs requires-test
-+ 1> /dev/null 2>& 1
-+ [ 0 -ne 0 ]
-+ ../pkg-config --static --libs requires-test
-+ R='-L/requires-test/lib -L/private-dep/lib -L/public-dep/lib -lrequires-test -lprivate-dep -lpublic-dep'
-+ [ '-L/requires-test/lib -L/private-dep/lib -L/public-dep/lib -lrequires-test -lprivate-dep -lpublic-dep' '!=' '-L/requires-test/lib -L/private-dep/lib -L/public-dep/lib -lrequires-test -lprivate-dep -lpublic-dep' ]
-+ return
 PASS: check-requires-private
+PASS: check-circular-requires
 PASS: check-includedir
-==================
-All 6 tests passed
-==================
-make[3]: Leaving directory `$(@D)/check'
-make[2]: Leaving directory `$(@D)/check'
-make[2]: Entering directory `$(@D)'
-make[2]: Leaving directory `$(@D)'
-make[1]: Leaving directory `$(@D)'
+PASS: check-conflicts
+PASS: check-missing
+PASS: check-special-flags
+PASS: check-sort-order
+PASS: check-duplicate-flags
+PASS: check-whitespace
+PASS: check-cmd-options
+PASS: check-version
+PASS: check-requires-version
+PASS: check-print-options
+PASS: check-path
+PASS: check-sysroot
+PASS: check-uninstalled
+PASS: check-debug
+PASS: check-gtk
+PASS: check-tilde
+PASS: check-relocatable
+===================
+All 26 tests passed
+===================
+make[3]: Leaving directory '$(@D)/check'
+make[2]: Leaving directory '$(@D)/check'
+make[1]: Leaving directory '$(@D)'