ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Merge branch 'master' into kyua

pull/100/head
William Pitcock 2016-10-27 21:51:09 -05:00
parent 4d7d3e54bf 1ce35f8bbb
commit 64c07aa90f
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -54,6 +54,7 @@ EXTRA_DIST = pkg.m4 \
tests/lib1/isystem.pc \ tests/lib1/isystem.pc \
tests/lib1/depgraph-break.pc \ tests/lib1/depgraph-break.pc \
tests/lib1/cflags-whitespace.pc \ tests/lib1/cflags-whitespace.pc \
tests/lib1/cflags-whitespace-trailing.pc \
tests/lib1/provides.pc \ tests/lib1/provides.pc \
tests/lib1/provides-request-simple.pc \ tests/lib1/provides-request-simple.pc \
tests/test_env.sh \ tests/test_env.sh \

2
README.md
View File

@ -88,7 +88,7 @@ to make this determination themselves.
## release tarballs ## release tarballs
Release tarballs are available at <http://rabbit.dereferenced.org/~nenolod/distfiles/>. Release tarballs are available at <https://distfiles.dereferenced.org/pkgconf/>.
Please do not use the github tarballs as they are not pristine (instead generated by github everytime Please do not use the github tarballs as they are not pristine (instead generated by github everytime
a download occurs). a download occurs).

3
libpkgconf/fragment.c
View File

@ -105,6 +105,9 @@ pkgconf_fragment_add(pkgconf_list_t *list, const char *string, unsigned int flag
{ {
pkgconf_fragment_t *frag; pkgconf_fragment_t *frag;
if (*string == '\0')
return;
if (!pkgconf_fragment_is_special(string)) if (!pkgconf_fragment_is_special(string))
{ {
frag = calloc(sizeof(pkgconf_fragment_t), 1); frag = calloc(sizeof(pkgconf_fragment_t), 1);

1
libpkgconf/pkg.c
View File

@ -348,6 +348,7 @@ pkgconf_pkg_free(pkgconf_pkg_t *pkg)
pkgconf_dependency_free(&pkg->requires); pkgconf_dependency_free(&pkg->requires);
pkgconf_dependency_free(&pkg->requires_private); pkgconf_dependency_free(&pkg->requires_private);
pkgconf_dependency_free(&pkg->conflicts); pkgconf_dependency_free(&pkg->conflicts);
pkgconf_dependency_free(&pkg->provides);
pkgconf_fragment_free(&pkg->cflags); pkgconf_fragment_free(&pkg->cflags);
pkgconf_fragment_free(&pkg->cflags_private); pkgconf_fragment_free(&pkg->cflags_private);

4
tests/lib1/cflags-whitespace-trailing.pc Normal file
View File

@ -0,0 +1,4 @@
Name: CFlags Trailing Whitespace Bug
Description: Demonstrates problems with -I with spaces
Version: 1
Cflags: -I/usr/include -I/usr/include/foo

2
tests/run.sh.in
View File

@ -291,6 +291,8 @@ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSROOT_DIR='/test' ${1}
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSROOT_DIR='/test' ${1} --cflags cflags-whitespace" \ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSROOT_DIR='/test' ${1} --cflags cflags-whitespace" \
"-I /test/opt/bad/include" "-I /test/opt/bad/include"
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSTEM_INCLUDE_PATH='/usr/include' ${1} --cflags cflags-whitespace-trailing" \
"-I/usr/include/foo"
# 10) tests for Provides system # 10) tests for Provides system
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --print-provides provides" \ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --print-provides provides" \