From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TnH2O-0003Di-Te for openembedded-core@lists.openembedded.org; Tue, 25 Dec 2012 00:02:30 +0100 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 24 Dec 2012 14:47:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,349,1355126400"; d="scan'208";a="269529462" Received: from unknown (HELO [10.255.12.150]) ([10.255.12.150]) by fmsmga002.fm.intel.com with ESMTP; 24 Dec 2012 14:47:33 -0800 Message-ID: <50D8DB85.4080509@linux.intel.com> Date: Mon, 24 Dec 2012 14:47:33 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Peter Seebach References: <344997e252e611dab1772e71d80500d92937da39.1355536994.git.peter.seebach@windriver.com> In-Reply-To: <344997e252e611dab1772e71d80500d92937da39.1355536994.git.peter.seebach@windriver.com> Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 1/1] pseudo_git.bb and friends: Update to 1.4.2. 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: Mon, 24 Dec 2012 23:02:30 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 12/14/2012 06:10 PM, Peter Seebach wrote: > Pseudo 1.4.2 adds a linkat() wrapper, needed for coreutils to work > on some newer systems. It also changes the way $(LIB) is used with > enable-static-sqlite, because this was broken for some 64-bit builds > (not in yocto, though). As a side-effect, the pseudo.inc recipe has > to be altered to use --with-static-sqlite=(explicit path), because the > default is that 64-bit pseudo would use lib64/libsqlite3.a. > > Note that the same --with-static-sqlite= is used for both 64-bit and > 32-bit builds on 64-bit systems with NO32LIBS = 0. This sounds scary, > but it's harmless; we only build the library for 32-bit, and the library > never actually uses the sqlite library; it just has to be specfied for > configure to complete. (This is going to become a low-priority bug > report for pseudo: It should have a configuration option for "library > only, and don't worry about sqlite.") > This patch continues to have issues after I fixed up the pathes. There is still and issue when build for a 32bit host, works for 64bit, but not 32bit. I will look into this later in the week, but this patch is on hold for now. Sau! > Signed-off-by: Peter Seebach > --- > meta/recipes-devtools/pseudo/pseudo.inc | 9 +++++---- > meta/recipes-devtools/pseudo/pseudo_1.4.1.bb | 8 -------- > meta/recipes-devtools/pseudo/pseudo_1.4.2.bb | 8 ++++++++ > meta/recipes-devtools/pseudo/pseudo_git.bb | 6 +++--- > 4 files changed, 16 insertions(+), 15 deletions(-) > delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.4.1.bb > create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.4.2.bb > > diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc > index 98f706c..e38bec8 100644 > --- a/meta/recipes-devtools/pseudo/pseudo.inc > +++ b/meta/recipes-devtools/pseudo/pseudo.inc > @@ -30,9 +30,9 @@ NO32LIBS ??= "1" > # Compile for the local machine arch... > do_compile () { > if [ "${SITEINFO_BITS}" = "64" ]; then > - ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath > + ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-static-sqlite=${prefix}/lib/libsqlite3.a --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --without-rpath > else > - ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath > + ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-static-sqlite=${prefix}/lib/libsqlite3.a --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --without-rpath > fi > oe_runmake ${MAKEOPTS} > } > @@ -51,7 +51,7 @@ do_compile_prepend_class-native () { > # built this will fail and be ignored. > make ${MAKEOPTS} distclean || : > > - ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath > + ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-static-sqlite=${prefix}/lib/libsqlite3.a --bits=32 --without-rpath > oe_runmake ${MAKEOPTS} libpseudo > # prevent it from removing the lib, but remove everything else > make 'LIB=foo' ${MAKEOPTS} distclean > @@ -63,7 +63,8 @@ do_compile_prepend_class-nativesdk () { > # We need the 32-bit libpseudo on a 64-bit machine... > # ... and we really, really, hope that the native host is > # x86, or else --bits may not work. > - ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath > + > + ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-static-sqlite=${prefix}/lib/libsqlite3.a --bits=32 --without-rpath > oe_runmake ${MAKEOPTS} libpseudo > # prevent it from removing the lib, but remove everything else > make 'LIB=foo' ${MAKEOPTS} distclean > diff --git a/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb > deleted file mode 100644 > index 70fe9c0..0000000 > --- a/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb > +++ /dev/null > @@ -1,8 +0,0 @@ > -require pseudo.inc > - > -PR = "r13" > - > -SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" > - > -SRC_URI[md5sum] = "b49bb87c7e1de33f37fea479ddb99dca" > -SRC_URI[sha256sum] = "ae4bfba2bd1e3954ea8f83bf06571ee4958bf7623e4fa897056281dddfe6446d" > diff --git a/meta/recipes-devtools/pseudo/pseudo_1.4.2.bb b/meta/recipes-devtools/pseudo/pseudo_1.4.2.bb > new file mode 100644 > index 0000000..fb0d178 > --- /dev/null > +++ b/meta/recipes-devtools/pseudo/pseudo_1.4.2.bb > @@ -0,0 +1,8 @@ > +require pseudo.inc > + > +PR = "r14" > + > +SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" > + > +SRC_URI[md5sum] = "44270e55c3b1323a5f0a1473ecb708a6" > +SRC_URI[sha256sum] = "c848f5555162e4d3eeed99b0993c794e625714b876315c24273490e0376ce3a8" > diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb > index e394ffb..5d5ff8c 100644 > --- a/meta/recipes-devtools/pseudo/pseudo_git.bb > +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb > @@ -1,8 +1,8 @@ > require pseudo.inc > > -SRCREV = "398a264490713c912b4ce465251a8a82a7905f45" > -PV = "1.4.1+git${SRCPV}" > -PR = "r28" > +SRCREV = "2f56acf04e85cfd617eaded954c1ce40403d7f66" > +PV = "1.4.2+git${SRCPV}" > +PR = "r29" > > DEFAULT_PREFERENCE = "-1" > >