From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f176.google.com (mail-we0-f176.google.com [74.125.82.176]) by mail.openembedded.org (Postfix) with ESMTP id AF1267055B; Wed, 16 Jul 2014 17:55:14 +0000 (UTC) Received: by mail-we0-f176.google.com with SMTP id q58so1306422wes.21 for ; Wed, 16 Jul 2014 10:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=myRexdFlmg/MGiQXweANmh/zAMVwVFyikbO6ZvSvUc4=; b=TaHWW7JDHXqv6MfR1BkqudgCnPkAF8SyQNQfhEZuYJJHrG50dJVwPUHuxfz7qO0Ry7 W54y/ZOMj44t6HqcpJH2oE/t0/7soQrRKDxpC9/JZrnnv6HnC8SFy+eDsaJX/FMnZtgJ N1M1jeLbw7J71H1P9zGi3f7+pWHueG3iavN5ivDJh1FsRhQ2Qc7mYPqsme8yN623u13O VMwffPQHhHItTk4bpYTdBv0QdUXVBfSe3ZpAzp4gspH+yWWypZWWzL6ISB1ng/4t+Eew 3jVkZKbBk0efJX3xpE4iEC2l52EJxpVAIZuq86RJOc0eywIputPjVrsYJfBHOMQfv796 VZ5A== X-Received: by 10.194.48.103 with SMTP id k7mr37380681wjn.68.1405533314693; Wed, 16 Jul 2014 10:55:14 -0700 (PDT) Received: from localhost (ip-89-176-104-3.net.upcbroadband.cz. [89.176.104.3]) by mx.google.com with ESMTPSA id d4sm11500842wiy.13.2014.07.16.10.55.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 10:55:13 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa Date: Wed, 16 Jul 2014 19:55:24 +0200 To: Mark Hatle Message-ID: <20140716175524.GG2433@jama> References: <20140708102041.70F60503C6@opal.openembedded.org> <20140716135259.GA2433@jama> <53C6873A.6070003@windriver.com> <20140716153336.GE2433@jama> <53C6A777.4090301@windriver.com> MIME-Version: 1.0 In-Reply-To: <53C6A777.4090301@windriver.com> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: openembedded-commits@lists.openembedded.org, openembedded-core@lists.openembedded.org Subject: Re: [oe-commits] Mark Hatle : db: Add version 6.0.30 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 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: Wed, 16 Jul 2014 17:55:17 -0000 X-Groupsio-MsgNum: 55094 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VPk9As2FDNdbSgZX" Content-Disposition: inline --VPk9As2FDNdbSgZX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 16, 2014 at 11:25:27AM -0500, Mark Hatle wrote: > On 7/16/14, 10:33 AM, Martin Jansa wrote: > > On Wed, Jul 16, 2014 at 09:07:54AM -0500, Mark Hatle wrote: > >> On 7/16/14, 8:52 AM, Martin Jansa wrote: > >>> On Tue, Jul 08, 2014 at 10:20:41AM +0000, git@git.openembedded.org wr= ote: > >>>> Module: openembedded-core.git > >>>> Branch: master > >>>> Commit: 04bb223110da2f92725c341bc3ec0cf26325f675 > >>>> URL: http://git.openembedded.org/?p=3Dopenembedded-core.git&a=3Dc= ommit;h=3D04bb223110da2f92725c341bc3ec0cf26325f675 > >>>> > >>>> Author: Mark Hatle > >>>> Date: Wed Jul 2 19:57:43 2014 -0500 > >>>> > >>>> db: Add version 6.0.30 > >>>> > >>>> The latest version of RPM5 requires Berkley DB 6.0.20 or newer. > >>>> > >>>> The license is now AGPL-3.0 in BDB 6.0. This may not be acceptable = to some, so > >>>> the previous version is retained as an alternative. > >>> > >>> This is failing on some hosts with: > >> > >> That's odd.. what host OS's and toolchain versions is it failing on? > >> > >> The iostream.h file SHOULD exist in all systems that have C++ developm= ent installed. > > > > Gentoo, gcc-4.9 and iostream.h exists in usual locations (at least now)= , rebuilding db > > manually helped >=20 > I don't have gentoo anywhere to try to reproduce and figure out what is w= rong=20 > here. Does the db 5.x still compile properly? (Switching preferred vers= ion) >=20 > Otherwise we'll have to find someone who has access to one of these hosts= and=20 > can dig in to figure out why the include isn't being found. You can easily download small Gentoo chroot: http://git.shr-project.org/git/?p=3Dshr-chroot.git but it probably isn't worth your time, it was only temporary (after cleansstate it worked fine) - so maybe it isn't even host distro specific. Feel free to ignored it if other people don't start reporting the same. Cheers, > >>> | In file included from > >>> /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/db/6.0.3= 0-r0/db-6.0.30/lang/cxx/cxx_channel.cpp:13:0: > >>> | ./db_cxx.h:59:22: fatal error: iostream.h: No such file or directory > >>> | #include > >>> | ^ > >>> > >>>> Signed-off-by: Mark Hatle > >>>> Signed-off-by: Richard Purdie > >>>> > >>>> --- > >>>> > >>>> .../db/db/arm-thumb-mutex_db5.patch | 10 ++ > >>>> meta/recipes-support/db/db_6.0.30.bb | 114 ++++++++= +++++++++++++ > >>>> 2 files changed, 124 insertions(+) > >>>> > >>>> diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/= meta/recipes-support/db/db/arm-thumb-mutex_db5.patch > >>>> index 40b13de..34e8db8 100644 > >>>> --- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch > >>>> +++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch > >>>> @@ -1,5 +1,15 @@ > >>>> +Original patch submitted by jbowler@nslu2-linux.org on 2005-11-17: > >>>> + > >>>> +db: fix thumb uclibc operation in 4.3.29 > >>>> + - uclibc thumb builds were using libpthread to implement mutexes,= the > >>>> + - uclibc version seems to be a stub (at least on thumb). This co= mmit > >>>> + - fixes the ARM/gcc-assembly mutex implementation so that it has = thumb > >>>> + - support and the resultant db4 works (tested on LE Thumb uclibc) > >>>> + > >>>> Upstream-Status: Inappropriate [embedded specific] > >>>> > >>>> +Author: jbowler@nslu2-linux.org > >>>> + > >>>> --- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.1818= 05366 -0600 > >>>> +++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117= -0600 > >>>> @@ -474,6 +474,25 @@ > >>>> diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-sup= port/db/db_6.0.30.bb > >>>> new file mode 100644 > >>>> index 0000000..9fc4a30 > >>>> --- /dev/null > >>>> +++ b/meta/recipes-support/db/db_6.0.30.bb > >>>> @@ -0,0 +1,114 @@ > >>>> +# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat) > >>>> +# > >>>> +# At present this package only installs the DB code > >>>> +# itself (shared libraries, .a in the dev package), > >>>> +# documentation and headers. > >>>> +# > >>>> +# The headers have the same names as those as v3 > >>>> +# of the DB, only one version can be used *for dev* > >>>> +# at once - DB3 and DB6 can both be installed on the > >>>> +# same system at the same time if really necessary. > >>>> +SECTION =3D "libs" > >>>> +SUMMARY =3D "Berkeley Database v6" > >>>> +HOMEPAGE =3D "http://www.oracle.com/technology/products/berkeley-db= /db/index.html" > >>>> +LICENSE =3D "AGPL-3.0" > >>>> +VIRTUAL_NAME ?=3D "virtual/db" > >>>> +RCONFLICTS_${PN} =3D "db3" > >>>> + > >>>> +SRC_URI =3D "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" > >>>> +SRC_URI +=3D "file://arm-thumb-mutex_db5.patch;patchdir=3D.. \ > >>>> + file://fix-parallel-build.patch \ > >>>> + " > >>>> + > >>>> +SRC_URI[md5sum] =3D "ad28eb86ad3203b5422844db179c585b" > >>>> +SRC_URI[sha256sum] =3D "608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9= f4d33d54516f3f6a20fd2" > >>>> + > >>>> +LIC_FILES_CHKSUM =3D "file://../LICENSE;md5=3D1ec8b0b17cc31513fe35a= b10716f8490" > >>>> + > >>>> +inherit autotools > >>>> + > >>>> +# Put virtual/db in any appropriate provider of a > >>>> +# relational database, use it as a dependency in > >>>> +# place of a specific db and use: > >>>> +# > >>>> +# PREFERRED_PROVIDER_virtual/db > >>>> +# > >>>> +# to select the correct db in the build (distro) .conf > >>>> +PROVIDES +=3D "${VIRTUAL_NAME}" > >>>> + > >>>> +# bitbake isn't quite clever enough to deal with sleepycat, > >>>> +# the distribution sits in the expected directory, but all > >>>> +# the builds must occur from a sub-directory. The following > >>>> +# persuades bitbake to go to the right place > >>>> +S =3D "${WORKDIR}/db-${PV}/dist" > >>>> +B =3D "${WORKDIR}/db-${PV}/build_unix" > >>>> + > >>>> +# The executables go in a separate package - typically there > >>>> +# is no need to install these unless doing real database > >>>> +# management on the system. > >>>> +inherit lib_package > >>>> + > >>>> +PACKAGES =3D+ "${PN}-cxx" > >>>> +FILES_${PN}-cxx =3D "${libdir}/*cxx*so" > >>>> + > >>>> + > >>>> +# The dev package has the .so link (as in db3) and the .a's - > >>>> +# it is therefore incompatible (cannot be installed at the > >>>> +# same time) as the db3 package > >>>> +# sort out the .so since they do version prior to the .so > >>>> +SOLIBS =3D "-6*.so" > >>>> +FILES_SOLIBSDEV =3D "${libdir}/libdb.so ${libdir}/libdb_cxx.so" > >>>> + > >>>> +#configuration - set in local.conf to override > >>>> +# All the --disable-* options replace --enable-smallbuild, which br= eaks a bunch of stuff (eg. postfix) > >>>> +DB6_CONFIG ?=3D "--enable-o_direct --disable-cryptography --disable= -queue --disable-replication --disable-verify --disable-compat185 --disable= -sql" > >>>> + > >>>> +EXTRA_OECONF =3D "${DB6_CONFIG} --enable-shared --enable-cxx --with= -sysroot" > >>>> + > >>>> +# Override the MUTEX setting here, the POSIX library is > >>>> +# the default - "POSIX/pthreads/library". > >>>> +# Don't ignore the nice SWP instruction on the ARM: > >>>> +# These enable the ARM assembler mutex code > >>>> +ARM_MUTEX =3D "--with-mutex=3DARM/gcc-assembly" > >>>> +MUTEX =3D "" > >>>> +MUTEX_arm =3D "${ARM_MUTEX}" > >>>> +MUTEX_armeb =3D "${ARM_MUTEX}" > >>>> +EXTRA_OECONF +=3D "${MUTEX}" > >>>> + > >>>> +# Cancel the site stuff - it's set for db3 and destroys the > >>>> +# configure. > >>>> +CONFIG_SITE =3D "" > >>>> +do_configure() { > >>>> + gnu-configize --force ${S} > >>>> + export STRIP=3D"true" > >>>> + oe_runconf > >>>> +} > >>>> + > >>>> +do_compile_prepend() { > >>>> + sed -i -e 's|hardcode_into_libs=3Dyes|hardcode_into_libs=3Dno|' \ > >>>> + ${B}/libtool > >>>> +} > >>>> + > >>>> +do_install_append() { > >>>> + mkdir -p ${D}/${includedir}/db60 > >>>> + mv ${D}/${includedir}/db.h ${D}/${includedir}/db60/. > >>>> + mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db60/. > >>>> + ln -s db60/db.h ${D}/${includedir}/db.h > >>>> + ln -s db60/db_cxx.h ${D}/${includedir}/db_cxx.h > >>>> + > >>>> + # The docs end up in /usr/docs - not right. > >>>> + if test -d "${D}/${prefix}/docs" > >>>> + then > >>>> + mkdir -p "${D}/${datadir}" > >>>> + test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}" > >>>> + mv "${D}/${prefix}/docs" "${D}/${docdir}" > >>>> + fi > >>>> + > >>>> + chown -R root:root ${D} > >>>> +} > >>>> + > >>>> +INSANE_SKIP_${PN} =3D "dev-so" > >>>> +INSANE_SKIP_${PN}-cxx =3D "dev-so" > >>>> + > >>>> +BBCLASSEXTEND =3D "native nativesdk" > >>>> + > >>>> > >>>> -- > >>>> _______________________________________________ > >>>> Openembedded-commits mailing list > >>>> Openembedded-commits@lists.openembedded.org > >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-commits > >>> > >> > > >=20 --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --VPk9As2FDNdbSgZX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlPGvIwACgkQN1Ujt2V2gBwZUQCgidXFJuVEAtT/pTvfez0ZUHJx 7C8AnRHRYQPbm9uzjnOlhjMxizFBGRSw =+htx -----END PGP SIGNATURE----- --VPk9As2FDNdbSgZX--