summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Galbusera <gizero@gmail.com>2017-11-16 19:05:53 +0100
committerArmin Kuster <akuster808@gmail.com>2018-02-01 07:32:03 -0800
commit45a874acf8935d5935874d814be434a0fcd20471 (patch)
tree8509754864af91896384d65ace62710b28cdc69e
parent52bdf26f3907975330b2c00cd6ef2ff73510e3f2 (diff)
downloadmeta-openembedded-45a874acf8935d5935874d814be434a0fcd20471.tar.gz
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 <gizero@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit 73ac0e419a6c78dfc68a34a0675c525bc6f01271) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb3
1 files changed, 2 insertions, 1 deletions
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 96b86f9a0..fae30d771 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"
12 12
13inherit autotools-brokensep pkgconfig 13inherit autotools-brokensep pkgconfig
14 14
15EXTRA_OEMAKE = "PREFIX=${prefix}"
16
15# By default INSTALL variable in Makefile is equal to 'cp -a', which preserves 17# By default INSTALL variable in Makefile is equal to 'cp -a', which preserves
16# ownership and causes host-user-contamination QA issue. 18# ownership and causes host-user-contamination QA issue.
17# And PREFIX defaults to /usr/local. 19# And PREFIX defaults to /usr/local.
18do_install_prepend() { 20do_install_prepend() {
19 export PREFIX=${prefix}
20 export INSTALL='cp -r' 21 export INSTALL='cp -r'
21} 22}