| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 34a9182814ae565d6f430f85cfe80c05fa9f2dda Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 24 Jul 2018 17:55:32 +0800 |
| 4 | Subject: [PATCH] respect-ldflags-also-from-bin_ldflags |
| 5 | |
| 6 | Upstream-Status: Inappropriate[oe-specific] |
| 7 | |
| 8 | update original patch to version 4.0.7 |
| 9 | |
| 10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 11 | --- |
| 12 | dlm_controld/Makefile | 4 ++-- |
| 13 | dlm_tool/Makefile | 2 +- |
| 14 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 15 | |
| 16 | diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile |
| 17 | index cf556c9..3381730 100644 |
| 18 | --- a/dlm_controld/Makefile |
| 19 | +++ b/dlm_controld/Makefile |
| 20 | @@ -55,11 +55,11 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 21 | BIN_CFLAGS += -fPIE -DPIE |
| 22 | BIN_CFLAGS += -I../include -I../libdlm |
| 23 | |
| 24 | -BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie |
| 25 | +BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie |
| 26 | BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum |
| 27 | |
| 28 | LIB_CFLAGS += $(BIN_CFLAGS) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 29 | -LIB_LDFLAGS += -Wl,-z,relro -pie |
| 30 | +LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie |
| 31 | |
| 32 | ifeq ($(USE_SD_NOTIFY),yes) |
| 33 | BIN_CFLAGS += $(shell pkg-config --cflags libsystemd) \ |
| 34 | diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile |
| 35 | index c16d8f5..a48a26f 100644 |
| 36 | --- a/dlm_tool/Makefile |
| 37 | +++ b/dlm_tool/Makefile |
| 38 | @@ -32,7 +32,7 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 39 | BIN_CFLAGS += -fPIE -DPIE |
| 40 | BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld |
| 41 | |
| 42 | -BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie |
| 43 | +BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie |
| 44 | BIN_LDFLAGS += -L../libdlm -L../dlm_controld |
| 45 | BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol |
| 46 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 47 | -- |
| 48 | 2.7.4 |
| 49 | |