Skip to content

P
protobuf
Commit 85430738 authored by Feng Xiao's avatar Feng Xiao
Browse files
Options

Merge pull request #369 from ensonic/master 

Uncomment conflict fields from pkg-config files.
parents cd141089 37e7a3c4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
protobuf-lite.pc.in
View file @ 85430738
...@@ -8,6 +8,4 @@ Description: Google's Data Interchange Format ...@@ -8,6 +8,4 @@ Description: Google's Data Interchange Format
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lprotobuf-lite @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Libs: -L${libdir} -lprotobuf-lite @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
Cflags: -I${includedir} @PTHREAD_CFLAGS@ Cflags: -I${includedir} @PTHREAD_CFLAGS@
# Commented out because it crashes pkg-config *sigh*: Conflicts: protobuf
# http://bugs.freedesktop.org/show_bug.cgi?id=13265
# Conflicts: protobuf
protobuf.pc.in
View file @ 85430738
...@@ -9,6 +9,4 @@ Version: @VERSION@ ...@@ -9,6 +9,4 @@ Version: @VERSION@
Libs: -L${libdir} -lprotobuf @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Libs: -L${libdir} -lprotobuf @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
Libs.private: @LIBS@ Libs.private: @LIBS@
Cflags: -I${includedir} @PTHREAD_CFLAGS@ Cflags: -I${includedir} @PTHREAD_CFLAGS@
# Commented out because it crashes pkg-config *sigh*: Conflicts: protobuf-lite
# http://bugs.freedesktop.org/show_bug.cgi?id=13265
# Conflicts: protobuf-lite
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment