aboutsummaryrefslogtreecommitdiffhomepage
path: root/protobuf.pc.in
diff options
context:
space:
mode:
authorGravatar Stefan Sauer <ensonic@google.com>2015-05-12 17:50:05 +0200
committerGravatar Stefan Sauer <ensonic@google.com>2015-05-12 17:50:05 +0200
commit37e7a3c4b841c11849c889853455675c98467ff5 (patch)
treed75ca1661c8f76e1d4fc2c75445ae4070aea5d30 /protobuf.pc.in
parentcd141089a120b6c15687e0653848d24682a07d32 (diff)
Uncomment conflict fields from pkg-config files.
The referenced bug was fixed in 2007 and has been released in pkg-config-0.23 (16.Jan.2008). The fixed version is widely available.
Diffstat (limited to 'protobuf.pc.in')
-rw-r--r--protobuf.pc.in4
1 files changed, 1 insertions, 3 deletions
diff --git a/protobuf.pc.in b/protobuf.pc.in
index 29f24877..49014903 100644
--- a/protobuf.pc.in
+++ b/protobuf.pc.in
@@ -9,6 +9,4 @@ Version: @VERSION@
Libs: -L${libdir} -lprotobuf @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
Libs.private: @LIBS@
Cflags: -I${includedir} @PTHREAD_CFLAGS@
-# Commented out because it crashes pkg-config *sigh*:
-# http://bugs.freedesktop.org/show_bug.cgi?id=13265
-# Conflicts: protobuf-lite
+Conflicts: protobuf-lite