From b25986f65978fd21b84ac27f9da32ceedc9b38ec Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 9 Oct 2016 03:36:09 +0200
Subject: [PATCH] Let building as PIE be optional

---
 src/browser/project.conf |  7 +++----
 src/desktop/project.conf | 10 ++++------
 src/project.conf         | 18 ++++--------------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/browser/project.conf b/src/browser/project.conf
index 61e3ccc..892d5a6 100644
--- a/src/browser/project.conf
+++ b/src/browser/project.conf
@@ -1,17 +1,16 @@
 targets=browser
 #cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
-cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libDesktop` -lintl
-ldflags=-Wl,-z,relro -Wl,-z,now
+ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,browser.h,callbacks.h,window.h
 
 [browser]
 type=binary
 depends=$(OBJDIR)../lib/libBrowser.a
 sources=browser.c,callbacks.c,window.c,main.c
-cflags=-fPIE
-ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser
 install=$(BINDIR)
 
 [browser.c]
diff --git a/src/desktop/project.conf b/src/desktop/project.conf
index f8f1cef..a98742d 100644
--- a/src/desktop/project.conf
+++ b/src/desktop/project.conf
@@ -1,17 +1,17 @@
 targets=desktop,desktopctl
 #cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
-cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libDesktop` -lintl
-ldflags=-Wl,-z,relro -Wl,-z,now
+ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,desktop.h,desktopicon.h,desktopiconwindow.h
 
 [desktop]
 type=binary
 depends=$(OBJDIR)../lib/libBrowser.a
 sources=desktop.c,desktopicon.c,desktopiconwindow.c
-cflags=`pkg-config --cflags x11 xrandr` -fPIE
-ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+cflags=`pkg-config --cflags x11 xrandr`
+ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
 install=$(BINDIR)
 
 [desktop.c]
@@ -28,8 +28,6 @@ depends=../common.h,desktop.h,desktopicon.h,desktopiconwindow.h
 [desktopctl]
 type=binary
 sources=desktopctl.c
-cflags=-fPIE
-ldflags=-pie
 install=$(BINDIR)
 
 [desktopctl.c]
diff --git a/src/project.conf b/src/project.conf
index 444238a..19d3098 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -2,45 +2,36 @@ subdirs=lib,browser,desktop
 targets=copy,delete,move,open,properties,view
 #cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
-cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libDesktop` -lintl
-ldflags=-Wl,-z,relro -Wl,-z,now
+ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,common.c,common.h
 
 [copy]
 type=binary
 sources=copy.c
-cflags=-fPIE
-ldflags=-pie
 install=$(BINDIR)
 
 [delete]
 type=binary
 sources=delete.c
-cflags=-fPIE
-ldflags=-pie
 install=$(BINDIR)
 
 [move]
 type=binary
 sources=move.c
-cflags=-fPIE
-ldflags=-pie
 install=$(BINDIR)
 
 [open]
 type=binary
 sources=open.c
-cflags=-fPIE
-ldflags=-pie
 install=$(BINDIR)
 
 [properties]
 type=binary
 depends=$(OBJDIR)lib/libBrowser.a
 sources=properties.c
-cflags=-fPIE
-ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser
 install=$(BINDIR)
 
 [properties.c]
@@ -51,8 +42,7 @@ cppflags=-D PREFIX=\"$(PREFIX)\"
 type=binary
 depends=$(OBJDIR)lib/libBrowser.a
 sources=view.c
-cflags=-fPIE
-ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser
 install=$(BINDIR)
 
 [view.c]