From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com ([192.55.52.88]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1T2Vmd-0003Fk-J9 for openembedded-core@lists.openembedded.org; Sat, 18 Aug 2012 01:16:51 +0200 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 17 Aug 2012 16:04:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.77,788,1336374000"; d="scan'208";a="210084815" Received: from unknown (HELO [10.255.12.253]) ([10.255.12.253]) by fmsmga002.fm.intel.com with ESMTP; 17 Aug 2012 16:04:51 -0700 Message-ID: <502ECE13.1080805@linux.intel.com> Date: Fri, 17 Aug 2012 16:04:51 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1344448856-20706-1-git-send-email-yao.zhao@windriver.com> In-Reply-To: <1344448856-20706-1-git-send-email-yao.zhao@windriver.com> Subject: Re: [PATCH V2] cracklib, zlib, perl: install libz, libcrack to /lib instead of /usr/libxx X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 23:16:51 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 08/08/2012 11:00 AM, Yao Zhao wrote: > In order to fix the QA Issue for libpam which installed to /lib but > reference /usr/libxx/libz and libcrack, install libz and libcrack > to /lib. > > Modify perl recipe to add STAGING_BASELIBDIR to library search path, original > recipe only has STAGING_LIBDIR, /lib, /usr/lib, which can't find the libz. > I think this patch needs more extensive testing, did you test this with shared state at all? I think there might be some additional PR bumps needed for recipes that depend on some of these libraries to recognize that they have moved. Sau! > Signed-off-by: Yao Zhao > --- > meta/recipes-core/zlib/zlib_1.2.7.bb | 11 +++++++++-- > meta/recipes-devtools/perl/perl_5.14.2.bb | 4 ++-- > meta/recipes-extended/cracklib/cracklib_2.8.19.bb | 4 +++- > 3 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-core/zlib/zlib_1.2.7.bb b/meta/recipes-core/zlib/zlib_1.2.7.bb > index 803fec3..0d8b6bd 100644 > --- a/meta/recipes-core/zlib/zlib_1.2.7.bb > +++ b/meta/recipes-core/zlib/zlib_1.2.7.bb > @@ -12,8 +12,11 @@ SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \ > SRC_URI[md5sum] = "2ab442d169156f34c379c968f3f482dd" > SRC_URI[sha256sum] = "49e2e9658dfb036900da6ea0267a737fa3c4eee6666776d378c79d52e9334934" > > +PR = "r1" > + > do_configure (){ > - ./configure --prefix=${prefix} --shared --libdir=${libdir} > + #sharedlibdir sets to {libdir} if not set > + ./configure --prefix=${prefix} --shared --libdir="${base_libdir}" > } > > do_compile (){ > @@ -21,7 +24,11 @@ do_compile (){ > } > > do_install() { > - oe_runmake DESTDIR=${D} install > + #install libz.so.1.2.7 libz.a to /lib > + #libz.a installs to libdir, overwrite the env libdir > + #install pkgconfig to env libdir/pkgconfig > + oe_runmake DESTDIR=${D} pkgconfigdir="${libdir}/pkgconfig" \ > + libdir="${base_libdir}" install > } > > BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb > index 561b30e..40dbc80 100644 > --- a/meta/recipes-devtools/perl/perl_5.14.2.bb > +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ > # We need gnugrep (for -I) > DEPENDS = "virtual/db grep-native" > DEPENDS += "gdbm zlib" > -PR = "r8" > +PR = "r9" > > # 5.10.1 has Module::Build built-in > PROVIDES += "libmodule-build-perl" > @@ -180,7 +180,7 @@ do_compile() { > sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" ext/Errno/Errno_pm.PL > sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" cpan/Compress-Raw-Zlib/config.in > sed -i -e 's|/usr/lib|""|g' cpan/Compress-Raw-Zlib/config.in > - sed -i -e 's|SYSROOTLIB|${STAGING_LIBDIR}|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm > + sed -i -e 's|"SYSROOTLIB"|("${STAGING_BASELIBDIR}", "${STAGING_LIBDIR}")|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm > > cd Cross > oe_runmake perl LD="${CCLD}" > diff --git a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb > index 2951396..e36703e 100644 > --- a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb > +++ b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb > @@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+" > LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" > > DEPENDS = "zlib" > -PR ="r0" > +PR ="r1" > > EXTRA_OECONF = "--without-python" > > @@ -15,3 +15,5 @@ SRC_URI[md5sum] = "ca0ec168d9c6466612204e8dfb2df8a9" > SRC_URI[sha256sum] = "7086b0ca23f875c9cd9ea2a993c262384b274dba9c4ea1da845ec8ac290748a9" > > inherit autotools gettext > + > +libdir = "${base_libdir}" >