This is the second part, from Guo Yixuan, I changed in the patch the author
line, I hope it's enough for giving credits to him!
Just my 0.02 $
Gianfranco
>________________________________
> Da: Oliver Bock <[email protected]>
>A: Gianfranco Costamagna <[email protected]>
>Cc: "[email protected]" <[email protected]>
>Inviato: Martedì 23 Aprile 2013 14:25
>Oggetto: Re: [boinc_dev] boinc_dev Digest, Vol 107, Issue 6
>
>
>On 4/23/13 14:23 , Oliver Bock wrote:
>> On 4/23/13 14:09 , Gianfranco Costamagna wrote:
>>> Sorry Oliver, what about sending patches in the debian format?
>>> I use dpkg-source for creating them, but I can use format patch too.
>>
>> Regular patches don't contain any meta data, like author and datetime
>> information. git format-patch (followed by git am) does. It's somewhat
>> important to be able to attribute a given commit/patch to the original
>> author if, say, in a year from now someone needs additional information
>> about its content/implementation. You want to be able to ask the patch's
>> original author about it.
>
>Also, you might want to get credit for your work :-)
>
>
>
>
From c262b00c8f0f917547327705e4bb0d9402824909 Mon Sep 17 00:00:00 2001
From: Guo Yixuan <[email protected]>
Date: Tue, 23 Apr 2013 15:03:03 +0200
Subject: [PATCH] Added hardening flags to samples apps
---
samples/example_app/Makefile | 6 +++---
samples/sleeper/Makefile | 4 ++--
samples/worker/Makefile | 4 ++--
samples/wrapper/Makefile | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/samples/example_app/Makefile b/samples/example_app/Makefile
index dc3e4af..bb03742 100644
--- a/samples/example_app/Makefile
+++ b/samples/example_app/Makefile
@@ -6,7 +6,7 @@ BOINC_LIB_DIR = $(BOINC_DIR)/lib
BOINC_ZIP_DIR = $(BOINC_DIR)/zip
FREETYPE_DIR = /usr/include/freetype2
-CXXFLAGS = -g \
+CXXFLAGS += -g \
-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-DAPP_GRAPHICS \
-I$(BOINC_DIR) \
@@ -62,12 +62,12 @@ install: uc2
# because otherwise you might get a version in /usr/lib etc.
uc2: uc2.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
- $(CXX) $(CXXFLAGS) -o uc2 uc2.o libstdc++.a -pthread \
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o uc2 uc2.o libstdc++.a -pthread \
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a
uc2_graphics: uc2_graphics.o ttfont.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
- $(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o libstdc++.a -pthread \
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o libstdc++.a -pthread \
$(BOINC_API_DIR)/libboinc_graphics2.a \
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a \
diff --git a/samples/sleeper/Makefile b/samples/sleeper/Makefile
index 13492ec..be2edbd 100644
--- a/samples/sleeper/Makefile
+++ b/samples/sleeper/Makefile
@@ -4,7 +4,7 @@ BOINC_DIR = ../..
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
-CXXFLAGS = -g \
+CXXFLAGS += -g \
-I$(BOINC_DIR) \
-I$(BOINC_LIB_DIR) \
-I$(BOINC_API_DIR) \
@@ -26,4 +26,4 @@ distclean:
/bin/rm -f $(PROGS) *.o libstdc++.a
sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
- g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/worker/Makefile b/samples/worker/Makefile
index 4abe4d9..61ab9ff 100644
--- a/samples/worker/Makefile
+++ b/samples/worker/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS = -g
+CXXFLAGS += -g
PROGS = worker
@@ -11,4 +11,4 @@ distclean:
rm $(PROGS)
worker: worker.o
- g++ $(CXXFLAGS) -o worker worker.o
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
diff --git a/samples/wrapper/Makefile b/samples/wrapper/Makefile
index 226a28d..bf33bca 100644
--- a/samples/wrapper/Makefile
+++ b/samples/wrapper/Makefile
@@ -6,7 +6,7 @@ BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
BOINC_ZIP_DIR = $(BOINC_DIR)/zip
-CXXFLAGS = -g -O0 \
+CXXFLAGS += -g -O0 \
-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-I$(BOINC_DIR) \
-I$(BOINC_LIB_DIR) \
@@ -38,4 +38,4 @@ REGEXP_OBJS = \
regexp_report.o
wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
- g++ $(CXXFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip
--
1.7.10.4
_______________________________________________
boinc_dev mailing list
[email protected]
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
