From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpfb1-g21.free.fr ([212.27.42.9]) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1OpRgT-000382-4r for openembedded-devel@lists.openembedded.org; Sat, 28 Aug 2010 22:07:26 +0200 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by smtpfb1-g21.free.fr (Postfix) with ESMTP id EB68C2CA12 for ; Sat, 28 Aug 2010 22:06:55 +0200 (CEST) Received: from localhost.localdomain (unknown [82.240.38.71]) by smtp2-g21.free.fr (Postfix) with ESMTP id 30CF74B00FA for ; Sat, 28 Aug 2010 22:06:50 +0200 (CEST) From: =?utf-8?q?Eric=20B=C3=A9nard?= To: openembedded-devel@lists.openembedded.org Date: Sat, 28 Aug 2010 22:06:35 +0200 Message-Id: <1283025996-28435-1-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <4C776F96.2000307@eukrea.com> References: <4C776F96.2000307@eukrea.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 212.27.42.9 X-SA-Exim-Mail-From: eric@eukrea.com X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on discovery X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:20:07 +0000) X-SA-Exim-Scanned: Yes (on linuxtogo.org) Subject: [PATCH 1/2] ncurses-5.7 : fix sdk build X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2010 20:07:26 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable fix ncurses-sdk build (tested on ubuntu using angstrom 2010.x) Signed-off-by: Eric B=C3=A9nard --- recipes/ncurses/ncurses_5.7.bb | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7= .bb index 57374ec..eebeb63 100644 --- a/recipes/ncurses/ncurses_5.7.bb +++ b/recipes/ncurses/ncurses_5.7.bb @@ -4,7 +4,7 @@ LICENSE =3D "MIT" SECTION =3D "libs" PATCHDATE =3D "20100501" PKGV =3D "${PV}+${PATCHDATE}" -PR =3D "r11" +PR =3D "r12" =20 DEPENDS =3D "ncurses-native unifdef-native" DEPENDS_virtclass-native =3D "unifdef-native" @@ -32,7 +32,7 @@ EXTRA_AUTORECONF =3D "-I m4" ENABLE_WIDEC =3D "true" # Build breaks on Ubuntu else :( ENABLE_WIDEC_virtclass-native =3D "false" - +ENABLE_WIDEC_virtclass-sdk =3D "false" =20 # Override the function from the autotools class; ncurses requires a # patched autoconf213 to generate the configure script. This autoconf @@ -152,10 +152,10 @@ do_install() { =20 python populate_packages_prepend () { libdir =3D bb.data.expand("${libdir}", d) - do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'ncurses-lib%s'= , 'ncurses %s library', prepend=3DTrue, extra_depends =3D '', allow_links= =3DTrue) + libname =3D bb.data.expand('${PN}-lib%s', d) + do_split_packages(d, libdir, '^lib(.*)\.so\..*', libname, 'ncurs= es %s library', prepend=3DTrue, extra_depends =3D '', allow_links=3DTrue) } =20 - pkg_postinst_ncurses-tools () { if [ "${PN}" =3D "ncurses" ]; then update-alternatives --install ${bindir}/clear clear clea= r.${PN} 100 @@ -172,16 +172,15 @@ pkg_prerm_ncurses-tools () { =20 BBCLASSEXTEND =3D "native sdk" =20 -PACKAGES =3D " \ - ncurses-dbg \ - ncurses-dev \ - ncurses-doc \ - ncurses-tools \ - ncurses \ - ncurses-static \ - ncurses-terminfo \ +PACKAGES +=3D " \ + ${PN}-tools \ + ${PN}-terminfo \ " -RSUGGESTS_${PN} =3D "ncurses-terminfo" + +RSUGGESTS_${PN} =3D "${PN}-terminfo" +RPROVIDES_${PN} =3D "libncurses5" +RCONFLICTS_${PN} =3D "libncurses5" +RREPLACES_${PN} =3D "libncurses5" =20 FILES_${PN} =3D "\ ${bindir}/tput \ @@ -192,7 +191,7 @@ FILES_${PN} =3D "\ =20 # This keeps only tput/tset in ncurses # clear/reset are in already busybox -FILES_ncurses-tools =3D "\ +FILES_${PN}-tools =3D "\ ${bindir}/tic \ ${bindir}/toe \ ${bindir}/infotocap \ @@ -204,6 +203,6 @@ FILES_ncurses-tools =3D "\ ${bindir}/tabs \ " =20 -FILES_ncurses-terminfo =3D "\ +FILES_${PN}-terminfo =3D "\ ${datadir}/terminfo \ " --=20 1.6.3.3