DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Let building as PIE be optional

Browse Source
This commit is contained in:
Pierre Pronchery 2016-10-09 03:36:09 +02:00
parent 351fb929fc
commit b25986f659
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/browser/project.conf
View File

@ -1,17 +1,16 @@
targets=browser targets=browser
#cppflags=-D EMBEDDED #cppflags=-D EMBEDDED
cflags_force=`pkg-config --cflags libDesktop` 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_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 dist=Makefile,browser.h,callbacks.h,window.h
[browser] [browser]
type=binary type=binary
depends=$(OBJDIR)../lib/libBrowser.a depends=$(OBJDIR)../lib/libBrowser.a
sources=browser.c,callbacks.c,window.c,main.c sources=browser.c,callbacks.c,window.c,main.c
cflags=-fPIE ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser
ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
install=$(BINDIR) install=$(BINDIR)
[browser.c] [browser.c]

10
src/desktop/project.conf
View File

@ -1,17 +1,17 @@
targets=desktop,desktopctl targets=desktop,desktopctl
#cppflags=-D EMBEDDED #cppflags=-D EMBEDDED
cflags_force=`pkg-config --cflags libDesktop` 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_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 dist=Makefile,desktop.h,desktopicon.h,desktopiconwindow.h
[desktop] [desktop]
type=binary type=binary
depends=$(OBJDIR)../lib/libBrowser.a depends=$(OBJDIR)../lib/libBrowser.a
sources=desktop.c,desktopicon.c,desktopiconwindow.c sources=desktop.c,desktopicon.c,desktopiconwindow.c
cflags=`pkg-config --cflags x11 xrandr` -fPIE cflags=`pkg-config --cflags x11 xrandr`
ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
install=$(BINDIR) install=$(BINDIR)
[desktop.c] [desktop.c]
@ -28,8 +28,6 @@ depends=../common.h,desktop.h,desktopicon.h,desktopiconwindow.h
[desktopctl] [desktopctl]
type=binary type=binary
sources=desktopctl.c sources=desktopctl.c
cflags=-fPIE
ldflags=-pie
install=$(BINDIR) install=$(BINDIR)
[desktopctl.c] [desktopctl.c]

18
src/project.conf
View File

@ -2,45 +2,36 @@ subdirs=lib,browser,desktop
targets=copy,delete,move,open,properties,view targets=copy,delete,move,open,properties,view
#cppflags=-D EMBEDDED #cppflags=-D EMBEDDED
cflags_force=`pkg-config --cflags libDesktop` 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_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 dist=Makefile,common.c,common.h
[copy] [copy]
type=binary type=binary
sources=copy.c sources=copy.c
cflags=-fPIE
ldflags=-pie
install=$(BINDIR) install=$(BINDIR)
[delete] [delete]
type=binary type=binary
sources=delete.c sources=delete.c
cflags=-fPIE
ldflags=-pie
install=$(BINDIR) install=$(BINDIR)
[move] [move]
type=binary type=binary
sources=move.c sources=move.c
cflags=-fPIE
ldflags=-pie
install=$(BINDIR) install=$(BINDIR)
[open] [open]
type=binary type=binary
sources=open.c sources=open.c
cflags=-fPIE
ldflags=-pie
install=$(BINDIR) install=$(BINDIR)
[properties] [properties]
type=binary type=binary
depends=$(OBJDIR)lib/libBrowser.a depends=$(OBJDIR)lib/libBrowser.a
sources=properties.c sources=properties.c
cflags=-fPIE ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser
ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
install=$(BINDIR) install=$(BINDIR)
[properties.c] [properties.c]
@ -51,8 +42,7 @@ cppflags=-D PREFIX=\"$(PREFIX)\"
type=binary type=binary
depends=$(OBJDIR)lib/libBrowser.a depends=$(OBJDIR)lib/libBrowser.a
sources=view.c sources=view.c
cflags=-fPIE ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser
ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
install=$(BINDIR) install=$(BINDIR)
[view.c] [view.c]