| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile |
| 2 | --- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200 |
| 3 | +++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200 |
| 4 | @@ -55,7 +55,7 @@ |
| 5 | BIN_CFLAGS += -fPIE -DPIE |
| 6 | BIN_CFLAGS += -I../include -I../libdlm |
| 7 | |
| 8 | -BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie |
| 9 | +BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie |
| 10 | BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum |
| 11 | |
| 12 | LIB_CFLAGS += $(BIN_CFLAGS) |
| 13 | diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile |
| 14 | --- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200 |
| 15 | +++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200 |
| 16 | @@ -32,7 +32,7 @@ |
| 17 | BIN_CFLAGS += -fPIE -DPIE |
| 18 | BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld |
| 19 | |
| 20 | -BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie |
| 21 | +BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie |
| 22 | BIN_LDFLAGS += -L../libdlm -L../dlm_controld |
| 23 | BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol |
| 24 | |
| 25 | diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile |
| 26 | --- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200 |
| 27 | +++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200 |
| 28 | @@ -59,7 +59,7 @@ |
| 29 | BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum |
| 30 | |
| 31 | LIB_CFLAGS += $(BIN_CFLAGS) |
| 32 | -LIB_LDFLAGS += -Wl,-z,relro -pie |
| 33 | +LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie |
| 34 | |
| 35 | ifeq ($(USE_SD_NOTIFY),yes) |
| 36 | BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \ |