libpkgconf: add support for proposed Requires.internal extension

pull/180/head
William Pitcock 2018-03-18 15:46:53 -05:00
parent 30f7a96ea2
commit f03ec3ff90
3 changed files with 28 additions and 1 deletions

8
NEWS
View File

@ -1,6 +1,14 @@
Changes from previous version of pkgconf Changes from previous version of pkgconf
======================================== ========================================
Changes from 1.4.2 to 1.5.0:
---------------------------
* Enhancements:
- pkgconf now supports the proposed Requires.internal pkg-config extension,
by merging it with the Requires.private list (there is no functional difference
between the two in our resolver implementation)
Changes from 1.4.1 to 1.4.2: Changes from 1.4.1 to 1.4.2:
---------------------------- ----------------------------

View File

@ -182,6 +182,7 @@ static const pkgconf_pkg_parser_keyword_pair_t pkgconf_pkg_parser_keyword_funcs[
{"Name", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, realname)}, {"Name", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, realname)},
{"Provides", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, provides)}, {"Provides", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, provides)},
{"Requires", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, required)}, {"Requires", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, required)},
{"Requires.internal", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_private)},
{"Requires.private", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_private)}, {"Requires.private", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_private)},
{"Version", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, version)}, {"Version", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, version)},
}; };

View File

@ -11,7 +11,9 @@ tests_init \
static_cflags \ static_cflags \
private_duplication \ private_duplication \
libs_static2 \ libs_static2 \
missing missing \
requires_internal \
requires_internal_missing
libs_body() libs_body()
{ {
@ -86,3 +88,19 @@ missing_body()
-o inline:"\n" \ -o inline:"\n" \
pkgconf --cflags missing-require pkgconf --cflags missing-require
} }
requires_internal_body()
{
atf_check \
-o inline:"-lbar -lbar-private -L/test/lib -lfoo \n" \
pkgconf --with-path="${selfdir}/lib1" --static --libs requires-internal
}
requires_internal_missing_body()
{
atf_check \
-s exit:1 \
-e ignore \
-o ignore \
pkgconf --with-path="${selfdir}/lib1" --static --libs requires-internal-missing
}