From 45a874acf8935d5935874d814be434a0fcd20471 Mon Sep 17 00:00:00 2001 From: Andrea Galbusera Date: Thu, 16 Nov 2017 19:05:53 +0100 Subject: hiredis: fix paths in pkgconfig conf file Set PREFIX via EXTRA_OEMAKE instead of exporting it in do_install_prepend(): than ensuring the correct prefix gets into hiredis.pc, which is generated by upstream makefile at do_compile() time. Signed-off-by: Andrea Galbusera Signed-off-by: Armin Kuster (cherry picked from commit 73ac0e419a6c78dfc68a34a0675c525bc6f01271) Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb b/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb index 96b86f9a0c..fae30d771d 100644 --- a/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb +++ b/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb @@ -12,10 +12,11 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig +EXTRA_OEMAKE = "PREFIX=${prefix}" + # By default INSTALL variable in Makefile is equal to 'cp -a', which preserves # ownership and causes host-user-contamination QA issue. # And PREFIX defaults to /usr/local. do_install_prepend() { - export PREFIX=${prefix} export INSTALL='cp -r' } -- cgit 1.2.3-korg