Attachment 8494 Details for Bug 4738 – fix up check/check-requires-private too

[patch] fix up check/check-requires-private too

pkg-config-0.21-privreq.patch (text/plain), 1.55 KB, created by Rex Dieter on 2007-01-24 06:33:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rex Dieter

Created: 2007-01-24 06:33:17 UTC

Size: 1.55 KB

patch

obsolete

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

Actions: View | Splinter Review

Attachments on bug 4738: 3860 | 8494 | 12126 | 13197 | 13198

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.