From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.windriver.com ([147.11.1.11]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SuTUy-0007li-I9 for openembedded-core@lists.openembedded.org; Thu, 26 Jul 2012 21:13:24 +0200 Received: from yzhao2-OptiPlex-990.corp.ad.wrs.com (yzhao2-optiplex-990.corp.ad.wrs.com [128.224.147.210]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id q6QJ1qCw024849 for ; Thu, 26 Jul 2012 12:01:52 -0700 (PDT) From: Yao Zhao To: openembedded-core@lists.openembedded.org Date: Thu, 26 Jul 2012 15:01:38 -0400 Message-Id: <1343329298-29586-1-git-send-email-yao.zhao@windriver.com> X-Mailer: git-send-email 1.7.9.5 Subject: [PATCH v2] bzip2-native: handling native path issue X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2012 19:13:25 -0000 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. add bzip2native.bbclass to let other packages to inherit and add dependency to bzip2-replacement-native. change python-native to inherit bzip2native class and remove the old bzip2-full-native dependency. Signed-off-by: Yao Zhao --- meta/classes/bzip2native.bbclass | 2 ++ .../recipes-devtools/python/python-native_2.7.3.bb | 4 ++-- meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 meta/classes/bzip2native.bbclass diff --git a/meta/classes/bzip2native.bbclass b/meta/classes/bzip2native.bbclass new file mode 100644 index 0000000..a2a7b31 --- /dev/null +++ b/meta/classes/bzip2native.bbclass @@ -0,0 +1,2 @@ +EXTRANATIVEPATH += "bzip2-native" +DEPENDS += "bzip2-replacement-native" 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..904dc80 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,5 @@ require python.inc -DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" +DEPENDS = "openssl-native zlib-native readline-native sqlite3-native" PR = "${INC_PR}.1" SRC_URI += "file://04-default-is-optimized.patch \ @@ -16,7 +16,7 @@ SRC_URI += "file://04-default-is-optimized.patch \ " S = "${WORKDIR}/Python-${PV}" -inherit native +inherit native bzip2native RPROVIDES += "python-distutils-native python-compression-native python-textutils-native python-core-native" 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" -- 1.7.9.5