public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* `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
This commit is contained in:
Eelco Dolstra 2008-10-14 12:06:36 +00:00
parent 1e6622f4d5
commit 5bc2dc536d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/misc/pkgconfig/requires-private.patch
View File

@ -1,9 +1,9 @@
diff -rc pkg-config-0.23-orig/main.c pkg-config-0.23/main.c 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-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,436 ****
--- 431,457 ---- --- 431,454 ----
else else
disable_private_libs(); disable_private_libs();
@ -19,11 +19,8 @@ diff -rc pkg-config-0.23-orig/main.c pkg-config-0.23/main.c
+ else + else
+ disable_requires(); + disable_requires();
+ +
+ /* Only process Requires.private if cflags or static libs wanted */ + /* Only process Requires.private if static libs wanted */
+ if (want_cflags || + if (want_static_lib_list)
+ want_I_cflags ||
+ want_other_cflags ||
+ want_static_lib_list)
+ enable_requires_private(); + enable_requires_private();
+ else + else
+ disable_requires_private(); + disable_requires_private();