|
@@ -1,4 +1,4 @@
|
|
|
-From a28e15092a298e0c73c6fc1ded0913275cf27cb0 Mon Sep 17 00:00:00 2001
|
|
|
+From e5340f816aa273cfda36998466739ca0748caafb Mon Sep 17 00:00:00 2001
|
|
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
|
Date: Fri, 28 Jun 2019 13:50:52 +0000
|
|
|
Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
|
|
@@ -23,12 +23,13 @@ Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
|
|
|
|
|
|
Upstream-Status: Pending
|
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
|
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
|
|
|
---
|
|
|
examples/Makefile | 6 ++++--
|
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git a/examples/Makefile b/examples/Makefile
|
|
|
-index 4ad605641..31d887639 100644
|
|
|
+index e9f9635ae..b2fbe2de1 100644
|
|
|
--- a/examples/Makefile
|
|
|
+++ b/examples/Makefile
|
|
|
@@ -2,6 +2,8 @@
|
|
@@ -44,13 +45,16 @@ index 4ad605641..31d887639 100644
|
|
|
|
|
|
add_person_cpp: add_person.cc protoc_middleman
|
|
|
pkg-config --cflags protobuf # fails if protobuf is not installed
|
|
|
-- c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
|
|
|
+- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
|
|
|
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
|
|
|
|
|
|
list_people_cpp: list_people.cc protoc_middleman
|
|
|
pkg-config --cflags protobuf # fails if protobuf is not installed
|
|
|
-- c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
|
|
|
+- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
|
|
|
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
|
|
|
|
|
|
add_person_dart: add_person.dart protoc_middleman_dart
|
|
|
|
|
|
+--
|
|
|
+2.17.1
|
|
|
+
|