815be0e3e6
1 OBS-URL: https://build.opensuse.org/request/show/238588 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=6
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
Index: Makefile
|
|
===================================================================
|
|
--- Makefile.orig 2014-06-05 19:23:53.559663353 +0200
|
|
+++ Makefile 2014-06-05 19:29:01.679662808 +0200
|
|
@@ -594,6 +594,35 @@ OPTIONS_CFLAGS += -DUSE_TFO
|
|
BUILD_OPTIONS += $(call ignore_implicit,USE_TFO)
|
|
endif
|
|
|
|
+# PIE
|
|
+ifneq ($(USE_PIE),)
|
|
+OPTIONS_CFLAGS += -DUSE_PIE
|
|
+BUILD_OPTIONS += $(call ignore_implicit,USE_PIE)
|
|
+OPTIONS_LDFLAGS += -pie
|
|
+# still need to figure out how to express this conditional in the makefile
|
|
+# %ifarch s390 s390x %sparc
|
|
+# PIEFLAGS="-fPIE"
|
|
+# %else
|
|
+# PIEFLAGS="-fpie"
|
|
+# %endif
|
|
+# PIE_FLAGS.s390 = -fPIE
|
|
+# PIE_FLAGS.i386 = -fpie
|
|
+# SEC_FLAGS += $(PIE_FLAGS.$(ARCH))
|
|
+OPTIONS_CFLAGS += -fpie
|
|
+endif
|
|
+
|
|
+ifneq ($(USE_STACKPROTECTOR),)
|
|
+OPTIONS_CFLAGS += -DUSE_STACKPROTECTOR
|
|
+BUILD_OPTIONS += $(call ignore_implicit,USE_STACKPROTECTOR)
|
|
+OPTIONS_CFLAGS += -fstack-protector
|
|
+endif
|
|
+
|
|
+ifneq ($(USE_RELRO_NOW),)
|
|
+OPTIONS_CFLAGS += -DUSE_RELRO_NOW
|
|
+BUILD_OPTIONS += $(call ignore_implicit,USE_RELRO_NOW)
|
|
+OPTIONS_LDFLAGS += -Wl,-z,relro,-z,now
|
|
+endif
|
|
+
|
|
# This one can be changed to look for ebtree files in an external directory
|
|
EBTREE_DIR := ebtree
|
|
|