diff options
Diffstat (limited to 'meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch')
| -rw-r--r-- | meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch index 0a2f31d554..f56359a473 100644 --- a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch +++ b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch @@ -1,12 +1,12 @@ -From 9107f3bd68aef6ae456a3cad664223b4f3d00131 Mon Sep 17 00:00:00 2001 +From ad207a6f83dac390b2d95e3a8262d27292921863 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 17:04:39 +0800 +Date: Wed, 26 Jun 2019 11:49:33 +0800 Subject: [PATCH] dlm: fix compile error since xml2-config should not be used xml2-config is disabled, so change Makefile to use pkgconfig to find libxml2. -Upstream-Status: Inappropriate +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> --- @@ -14,21 +14,21 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/Makefile b/fence/Makefile -index 77bf0fd..cca0b2c 100644 +index b927879..6e16078 100644 --- a/fence/Makefile +++ b/fence/Makefile -@@ -30,11 +30,11 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - -fdiagnostics-show-option \ +@@ -18,11 +18,11 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -fstack-clash-protection -Wl,-z,now - BIN_CFLAGS += -fPIE -DPIE --BIN_CFLAGS += `xml2-config --cflags` -+BIN_CFLAGS += `pkg-config libxml-2.0 --cflags` - BIN_CFLAGS += -I../include + CFLAGS += -fPIE -DPIE +-CFLAGS += `xml2-config --cflags` ++CFLAGS += `pkg-config libxml-2.0 --cflags` + CFLAGS += -I../include - BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie --BIN_LDFLAGS += `xml2-config --libs` -+BIN_LDFLAGS += `pkg-config libxml-2.0 --libs` - BIN_LDFLAGS += -ldl + LDFLAGS += -Wl,-z,relro -pie +-LDFLAGS += `xml2-config --libs` ++LDFLAGS += `pkg-config libxml-2.0 --libs` + LDFLAGS += -ldl all: $(BIN_TARGET) -- |