Patchwork [v3] bzip2-native: handling native path issue

login
register
mail settings
Submitter Yao Zhao
Date July 26, 2012, 8:34 p.m.
Message ID <1343334859-21249-1-git-send-email-yao.zhao@windriver.com>
Download mbox | patch
Permalink /patch/33163/
State Accepted
Commit 5bf3541836457465aa76577bfb41cdf6316213c9
Headers show

Comments

Yao Zhao - July 26, 2012, 8:34 p.m.
follow Richard's approach, modify bzip2-native recipe to install bzip2 package
binaries to STAGING_BINDIR_NATIVE/bzip2-native to avoid problems when other
package is doing upack to reference bzip2. libbz2.so* still installs to
STAGING_LIBDIR_NATIVE.

change python-native to depends on bzip2-replacement-native instead of
bzip2-full-native and add EXTRANATIVEPATH for bzip2-native.

Didn't add bzip2native.bbclass as python-native is the only user so far.

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
---
 .../recipes-devtools/python/python-native_2.7.3.bb |    4 +++-
 meta/recipes-extended/bzip2/bzip2_1.0.6.bb         |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Richard Purdie - July 29, 2012, 9:31 a.m.
On Thu, 2012-07-26 at 16:34 -0400, Yao Zhao wrote:
> follow Richard's approach, modify bzip2-native recipe to install bzip2 package
> binaries to STAGING_BINDIR_NATIVE/bzip2-native to avoid problems when other
> package is doing upack to reference bzip2. libbz2.so* still installs to
> STAGING_LIBDIR_NATIVE.
> 
> change python-native to depends on bzip2-replacement-native instead of
> bzip2-full-native and add EXTRANATIVEPATH for bzip2-native.
> 
> Didn't add bzip2native.bbclass as python-native is the only user so far.
> 
> Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
> ---
>  .../recipes-devtools/python/python-native_2.7.3.bb |    4 +++-
>  meta/recipes-extended/bzip2/bzip2_1.0.6.bb         |    4 +++-
>  2 files changed, 6 insertions(+), 2 deletions(-)


Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index c89f9f9..d450949 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -1,5 +1,7 @@ 
 require python.inc
-DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
+
+EXTRANATIVEPATH += "bzip2-native"
+DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native sqlite3-native"
 PR = "${INC_PR}.1"
 
 SRC_URI += "file://04-default-is-optimized.patch \
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index 43b462a..e0c710b 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -24,6 +24,8 @@  inherit autotools update-alternatives
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "bunzip2 bzcat"
 
+#install binaries to bzip2-native under sysroot for replacement-native
+EXTRA_OECONF_virtclass-native += "--bindir=${STAGING_BINDIR_NATIVE}/${PN}"
 do_configure_prepend () {
 	cp ${WORKDIR}/configure.ac ${S}/
 	cp ${WORKDIR}/Makefile.am ${S}/
@@ -40,5 +42,5 @@  FILES_libbz2-staticdev = "${libdir}/*.a"
 SECTION_libbz2-staticdev = "devel"
 RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})"
 
-PROVIDES_append_virtclass-native = " bzip2-full-native"
+PROVIDES_append_virtclass-native = " bzip2-replacement-native"
 BBCLASSEXTEND = "native"