[oe-commits] [meta-openembedded] 10/42: hiredis: fix paths in pkgconfig conf file

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch rocko-next
in repository meta-openembedded.

commit 43b3251a706ee6c951448591e5bbfa95cd40a062
Author: Andrea Galbusera <gizero at gmail.com>
AuthorDate: Thu Nov 16 19:05:53 2017 +0100

    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 at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
    (cherry picked from commit 73ac0e419a6c78dfc68a34a0675c525bc6f01271)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 96b86f9..fae30d7 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'
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.