From 5bc2dc536d138611011baa147654d9fb1efddc29 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 14 Oct 2008 12:06:36 +0000 Subject: [PATCH] * `pkg-config --cflags': ignore Requires.private (just like --libs). Whether this is correct is debatable (especially since there is no formal semantics for Requires.private), but not ignoring it breaks some packages (like Pango's dependency on Cairo). svn path=/nixpkgs/branches/stdenv-updates/; revision=13060 --- .../tools/misc/pkgconfig/requires-private.patch | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconfig/requires-private.patch b/pkgs/development/tools/misc/pkgconfig/requires-private.patch index f90b73b6c46..f5dee097d60 100644 --- a/pkgs/development/tools/misc/pkgconfig/requires-private.patch +++ b/pkgs/development/tools/misc/pkgconfig/requires-private.patch @@ -1,9 +1,9 @@ diff -rc pkg-config-0.23-orig/main.c pkg-config-0.23/main.c *** pkg-config-0.23-orig/main.c 2008-01-16 23:06:48.000000000 +0100 ---- pkg-config-0.23/main.c 2008-10-13 14:41:42.000000000 +0200 +--- pkg-config-0.23/main.c 2008-10-14 13:04:04.000000000 +0200 *************** *** 431,436 **** ---- 431,457 ---- +--- 431,454 ---- else disable_private_libs(); @@ -19,11 +19,8 @@ diff -rc pkg-config-0.23-orig/main.c pkg-config-0.23/main.c + else + disable_requires(); + -+ /* Only process Requires.private if cflags or static libs wanted */ -+ if (want_cflags || -+ want_I_cflags || -+ want_other_cflags || -+ want_static_lib_list) ++ /* Only process Requires.private if static libs wanted */ ++ if (want_static_lib_list) + enable_requires_private(); + else + disable_requires_private();