Attachment 3860 Details for Bug 4738 – a quick fix

[patch] a quick fix

pkg-config-0.20-alt-ignore-private-requires.patch (text/plain), 1.06 KB, created by Mikhail Zabaluev on 2005-11-21 22:41:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Zabaluev

Created: 2005-11-21 22:41:30 UTC

Size: 1.06 KB

patch

obsolete

>--- pkg-config-0.20/parse.c.orig-privreq	2005-10-16 21:09:39 +0400
>+++ pkg-config-0.20/parse.c	2005-11-21 13:49:28 +0300
>@@ -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 ||

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.