[oe-commits] [meta-openembedded] 15/129: xerces-c: fix a wrong PACKAGECONFIG option

[git at git.openembedded.org]

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

martin_jansa pushed a commit to branch pyro-next
in repository meta-openembedded.

commit c7d2ad2e3ec3056c14d2a25bc2a5693f70ae1196
Author: Ming Liu <peter.x.liu at external.atlascopco.com>
AuthorDate: Tue May 16 13:23:18 2017 +0200

    xerces-c: fix a wrong PACKAGECONFIG option
    
    In xerces-c's configure, these options is being referred as follows:
    ......
        curl_flags="-I$with_curl/include"
        curl_libs="-L$with_curl/lib -lcurl"
    
        icu_flags="-I$with_icu/include"
        icu_libs="-L$with_icu/lib -licuuc -licudata"
    ......
    
    so they shouldn't be set to ${STAGING_DIR}, use
    ${STAGING_DIR_TARGET}${prefix} instead.
    
    Signed-off-by: Ming Liu <peter.x.liu at external.atlascopco.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb
index b848b06..64ac747 100644
--- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb
+++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb
@@ -16,8 +16,8 @@ SRC_URI[sha256sum] = "9408f12c1628ecf80730bedbe8b2caad810edd01bb4c66f77b60c873e8
 inherit autotools
 
 PACKAGECONFIG ??= "curl icu"
-PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR},--with-curl=no,curl"
-PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR},--with-icu=no,icu"
+PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl"
+PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu"
 
 do_install_prepend () {
     sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc

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