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

Ensure -I is never merged back as well

pull/81/head
Baptiste Daroussin 2015-07-19 23:00:35 +02:00
parent 5a8dadafc6
commit 72c6e9237b
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fragment.c
View File

@ -117,6 +117,8 @@ pkg_fragment_can_merge_back(pkg_fragment_t *base, unsigned int flags, bool is_pr
return false; return false;
if (base->type == 'L') if (base->type == 'L')
return false; return false;
if (base->type == 'I')
return false;
return true; return true;
} }

2
tests/lib1/prefix-foo1.pc
View File

@ -7,6 +7,6 @@ Name: prefix-foo1
Description: A testing pkg-config file Description: A testing pkg-config file
Version: 1.2.3 Version: 1.2.3
Libs: -L${libdir} -lfoo1 Libs: -L${libdir} -lfoo1
Cflags: -fPIC -I${includedir}/foo1 Cflags: -fPIC -I${includedir}/foo -DBAR
Cflags.private: -DFOO_STATIC Cflags.private: -DFOO_STATIC

2
tests/lib1/prefix-foo2.pc
View File

@ -7,6 +7,6 @@ Name: prefix-foo2
Description: A testing pkg-config file Description: A testing pkg-config file
Version: 1.2.3 Version: 1.2.3
Libs: -L${libdir} -lfoo2 Libs: -L${libdir} -lfoo2
Cflags: -fPIC -I${includedir}/foo2 Cflags: -fPIC -I${includedir}/foo -DFOO
Cflags.private: -DFOO_STATIC Cflags.private: -DFOO_STATIC

2
tests/run.sh.in
View File

@ -268,6 +268,8 @@ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs prefix-foo1" \
'-L/usr/bar/lib -lfoo1' '-L/usr/bar/lib -lfoo1'
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs prefix-foo1 prefix-foo2" \ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs prefix-foo1 prefix-foo2" \
'-L/usr/bar/lib -lfoo1 -lfoo2' '-L/usr/bar/lib -lfoo1 -lfoo2'
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --cflags prefix-foo1 prefix-foo2" \
'-I/usr/bar/include/foo -DBAR -fPIC -DFOO'
# 10) tests for internal getopt implementation with options at the end # 10) tests for internal getopt implementation with options at the end
if [ "x@STRICT_MODE@" = "xno" ]; then if [ "x@STRICT_MODE@" = "xno" ]; then