| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From ad207a6f83dac390b2d95e3a8262d27292921863 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Changqing Li <changqing.li@windriver.com> |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 3 | Date: Wed, 26 Jun 2019 11:49:33 +0800 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] dlm: fix compile error since xml2-config should not be used |
| 5 | |
| 6 | xml2-config is disabled, so change Makefile to use pkgconfig |
| 7 | to find libxml2. |
| 8 | |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 9 | Upstream-Status: Inappropriate [oe-specific] |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 10 | |
| 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 12 | --- |
| 13 | fence/Makefile | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/fence/Makefile b/fence/Makefile |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 17 | index b927879..6e16078 100644 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 18 | --- a/fence/Makefile |
| 19 | +++ b/fence/Makefile |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 20 | @@ -18,11 +18,11 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ |
| 21 | -fstack-clash-protection -Wl,-z,now |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 23 | CFLAGS += -fPIE -DPIE |
| 24 | -CFLAGS += `xml2-config --cflags` |
| 25 | +CFLAGS += `pkg-config libxml-2.0 --cflags` |
| 26 | CFLAGS += -I../include |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 27 | |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 28 | LDFLAGS += -Wl,-z,relro -pie |
| 29 | -LDFLAGS += `xml2-config --libs` |
| 30 | +LDFLAGS += `pkg-config libxml-2.0 --libs` |
| 31 | LDFLAGS += -ldl |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 32 | |
| 33 | all: $(BIN_TARGET) |
| 34 | -- |
| 35 | 2.7.4 |
| 36 | |