|
 |
1880026 |
--- pkg-config-0.21/parse.c.privreq 2006-08-16 13:45:45.000000000 -0500
|
|
|
1880026 |
+++ pkg-config-0.21/parse.c 2007-01-24 08:26:13.000000000 -0600
|
|
|
1880026 |
@@ -946,7 +946,12 @@
|
|
|
1880026 |
else if (strcmp (tag, "Version") == 0)
|
|
|
1880026 |
parse_version (pkg, p, path);
|
|
|
1880026 |
else if (strcmp (tag, "Requires.private") == 0)
|
|
|
1880026 |
- parse_requires_private (pkg, p, path);
|
|
|
1880026 |
+ {
|
|
|
1880026 |
+ if (ignore_private_libs == FALSE)
|
|
|
1880026 |
+ parse_requires_private (pkg, p, path);
|
|
|
1880026 |
+ else
|
|
|
1880026 |
+ goto cleanup;
|
|
|
1880026 |
+ }
|
|
|
1880026 |
else if (strcmp (tag, "Requires") == 0)
|
|
|
1880026 |
{
|
|
|
1880026 |
if (ignore_requires == FALSE)
|
|
|
1880026 |
@@ -954,9 +959,13 @@
|
|
|
1880026 |
else
|
|
|
1880026 |
goto cleanup;
|
|
|
1880026 |
}
|
|
|
1880026 |
- else if ((strcmp (tag, "Libs.private") == 0) &&
|
|
|
1880026 |
- ignore_private_libs == FALSE)
|
|
|
1880026 |
- parse_libs_private (pkg, p, path);
|
|
|
1880026 |
+ else if (strcmp (tag, "Libs.private") == 0)
|
|
|
1880026 |
+ {
|
|
|
1880026 |
+ if (ignore_private_libs == FALSE)
|
|
|
1880026 |
+ parse_libs_private (pkg, p, path);
|
|
|
1880026 |
+ else
|
|
|
1880026 |
+ goto cleanup;
|
|
|
1880026 |
+ }
|
|
|
1880026 |
else if (strcmp (tag, "Libs") == 0)
|
|
|
1880026 |
parse_libs (pkg, p, path);
|
|
|
1880026 |
else if (strcmp (tag, "Cflags") == 0 ||
|
|
|
1880026 |
--- pkg-config-0.21/check/check-requires-private.privreq 2006-08-16 12:05:30.000000000 -0500
|
|
|
1880026 |
+++ pkg-config-0.21/check/check-requires-private 2007-01-24 08:27:06.000000000 -0600
|
|
|
1880026 |
@@ -16,7 +16,7 @@
|
|
|
1880026 |
|
|
|
1880026 |
# still expect those cflags for static linking case
|
|
|
1880026 |
ARGS="--static --cflags requires-test"
|
|
|
1880026 |
-RESULT="-I/requires-test/include -I/public-dep/include"
|
|
|
1880026 |
+RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include"
|
|
|
1880026 |
run_test
|
|
|
1880026 |
|
|
|
1880026 |
# expect libs for just requires-test and public-dep
|