commit: 89c4f91f477e34e179a694db19129ab0d2bf6268 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Thu Jul 16 22:27:01 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Jul 16 22:27:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=89c4f91f
sys-libs/tdb: update. sys-libs/tdb/Manifest | 7 +-- .../tdb/files/add_missing_stdbool_h_include.patch | 27 ++++++++++ .../tdb/files/tdb-remove-check-bsd-strtoll.patch | 9 ++-- sys-libs/tdb/tdb-1.2.12-r99.ebuild | 44 --------------- sys-libs/tdb/tdb-1.3.0-r99.ebuild | 63 ++++++++++++++++++++++ 5 files changed, 98 insertions(+), 52 deletions(-) diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest index 8f7f4d5..d08a7bd 100644 --- a/sys-libs/tdb/Manifest +++ b/sys-libs/tdb/Manifest @@ -1,4 +1,5 @@ -AUX tdb-remove-check-bsd-strtoll.patch 1181 SHA256 f1f90725967b0df76b24613c8382cd1b93f7717b49a2981b3ff5d36a49b7e7c6 SHA512 ccafbfaee3984a15e81cdd891d47d1100f221f2a22150f8cc14f0d2eed1d1412dcf7cad99cf3bb845825e6a75ac0d33331b26e07b17f718c40ab8b9aac8b935a WHIRLPOOL 8f2703ba60e898d7d1306712856bfb277d168a26845e754172f2451b6f8439f6f2d6f395b2a5d527b41b630c79c709f2fe26872a3e634989423afb4226a52d7b -DIST tdb-1.2.12.tar.gz 462590 SHA256 282d3db1cc56ac3011ae5f3922fd0c5bb217ecb0320836c23b6fe67f2163a71f SHA512 7f6061cae722db79a604ed517e615bed8d06c1b69549e6c1b771611797e1b4f64ebc7af63c3b911ed055979dd6782c8fca44af829c3466911f4181e835ef9b28 WHIRLPOOL 1f584052432c2b87b3d203dd2aefdf9fb425181e5bbd2cfd2f23ede512fa01623f08c33e85afdddfb3c08d776892c15382d9868bfb22a4a36987e06668ffc828 -EBUILD tdb-1.2.12-r99.ebuild 1021 SHA256 7496a54b221b3fb00c4c9e26581c2dce3b5af66e9a5d23986605f3de6f0fb5a0 SHA512 ec640d09c237d137fa63d44c9331d3257cb5bd614a18d0e112c41fcaf6996d8a11edecfdcd7691895cecdb53e89da8ba1aff247e975cbc5d5b3ca89eb7dbbb88 WHIRLPOOL 95031b9eefafebc3f3fd793997393d75776d97d25ce7b1472484fbe582293fa3dd0e7da75b8823aebe5b298283872f7f13df4f1daec5c7c1854bbfe33eac8360 +AUX add_missing_stdbool_h_include.patch 735 SHA256 d183183b15242ca3f2273983a5ba6f900e49626f21f1d6b4efad81769161497f SHA512 cbfd63c4af8cff139648b136ce1ca619a21e7606256196297bb487dab6a7c4055bd7ab6d7462fb1d336518dbb9399cb1c25563f384f84aec575ef89f71faa10e WHIRLPOOL d774b0ac858b76b1355dc64ba1167867f3fa337620fb20fb9dad6760f2ce56916443f7fcd6c1c3a1c94ef0a62f9d5fffcd1bd45d2ce3acdf0ce4f7b923844f1d +AUX tdb-remove-check-bsd-strtoll.patch 1133 SHA256 75cb8c9f2ad7f8f93841d2ca0d8260c39ea5faab00ab294cbdd6840802bba9a2 SHA512 b85cb132efb17fccf9dbdffe50cfa9468b3da15b28923ee2f0908be558460ce2e5ec421b2f90b47036eb55d159804de016caf025c7ad9aebe79cc446b12e9cd6 WHIRLPOOL af8e044d43693d8bcc1622de2d5072467103d812acd0744185aa94c13b74d2aa0880f71beefa36847dbb355a77af2b1245cf2699bb6ea404772d5c7d9b6298cf +DIST tdb-1.3.0.tar.gz 479096 SHA256 04bee48d405ab7815810575a6e0cb364cc0eea6187b54b18c84e9c18a768ba20 SHA512 b9a66070002879119627bae82d8bafeb52ae336afdc4d97e14a7e4ff78e42c7c516f8349781964c2bfbbcc6949247c5fa9519f936c884151ffff9e121f9f9334 WHIRLPOOL 88da0b12ecdc8746bf627f2e1ce896b1a2b435c1dc34cd5649cd1554aa2cf90fe16014dd31fc45605d6a3dcdf02c3a09b1a43e68527497379734a96a3dd99711 +EBUILD tdb-1.3.0-r99.ebuild 1461 SHA256 96c36670987f1ec11ba2ff07911aeaafdf80dae0ef004211e6b2e11f45b403aa SHA512 86ff5b9110dc34e8fc8f2c2eeb8619797386280e1877cc112723d8b60d78071d2e312dd3843d9fae710263cf9dd4bc03bccc59ccd3b28e60ede27ce35a40aca5 WHIRLPOOL 5c5990f302b5336a8a76e68d9706fd5613dec5e922f38355e605d6d3d191fd684a8318991cc2bf3058b965c5627a3e296533c3a36c8e09941fca9cbca243ddb1 MISC metadata.xml 260 SHA256 9c67a75d6c6db8d88233eb27271c93874a4b763907a61f189970574fc957e0e6 SHA512 611e0004aba6d842ba71a9b9f74b8301d1a7d8d366208122001f5d164ae34b88c1ba2d41c0b25c760cea155387e5e7a4b3d141d6b21cc997f894a21c519a07c9 WHIRLPOOL 1bf0ee15987eee963adc9506dff9e8e978bcb8b7bdc9381f468fdc92ed39e356c69dc67af161da4eac8b46098a28ab8b6249f0efeb5709f7cd4f3f8a4749b675 diff --git a/sys-libs/tdb/files/add_missing_stdbool_h_include.patch b/sys-libs/tdb/files/add_missing_stdbool_h_include.patch new file mode 100644 index 0000000..756eaae --- /dev/null +++ b/sys-libs/tdb/files/add_missing_stdbool_h_include.patch @@ -0,0 +1,27 @@ +From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001 +From: Adam Williamson <[email protected]> +Date: Fri, 23 May 2014 10:08:14 -0700 +Subject: [PATCH] tdb/include: include stdbool.h in tdb.h + +Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does +not include stdbool.h. This causes any build including tdb.h to fail, at least +for me with GCC 4.9.0. +--- + lib/tdb/include/tdb.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h +index 5ea5e60..03e429c 100644 +--- a/lib/tdb/include/tdb.h ++++ b/lib/tdb/include/tdb.h +@@ -31,6 +31,7 @@ extern "C" { + #endif + + #include <signal.h> ++#include <stdbool.h> + + /** + * @defgroup tdb The tdb API +-- +1.9.3 + diff --git a/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch b/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch index 8108209..d367cf4 100644 --- a/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch +++ b/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch @@ -1,7 +1,7 @@ -diff -Naur tdb-1.2.11.orig/lib/replace/wscript tdb-1.2.11/lib/replace/wscript ---- tdb-1.2.11.orig/lib/replace/wscript 2012-11-30 08:51:31.000000000 +0000 -+++ tdb-1.2.11/lib/replace/wscript 2014-02-23 12:37:58.921617847 +0000 -@@ -215,21 +215,6 @@ +diff -Naur tdb-1.3.0.orig/lib/replace/wscript tdb-1.3.0/lib/replace/wscript +--- tdb-1.3.0.orig/lib/replace/wscript 2014-05-22 22:30:38.000000000 +0000 ++++ tdb-1.3.0/lib/replace/wscript 2015-07-16 22:13:34.985767738 +0000 +@@ -276,20 +276,6 @@ #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect #Let's detect those cases @@ -17,7 +17,6 @@ diff -Naur tdb-1.2.11.orig/lib/replace/wscript tdb-1.2.11/lib/replace/wscript - msg="Checking correct behavior of strtoll", - headers = 'errno.h', - execute = True, -- define_ret = True, - define = 'HAVE_BSD_STRTOLL', - ) conf.CHECK_FUNCS('if_nametoindex strerror_r') diff --git a/sys-libs/tdb/tdb-1.2.12-r99.ebuild b/sys-libs/tdb/tdb-1.2.12-r99.ebuild deleted file mode 100644 index 3914093..0000000 --- a/sys-libs/tdb/tdb-1.2.12-r99.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.12-r1.ebuild,v 1.1 2013/06/30 16:33:13 jlec Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit waf-utils python-single-r1 - -DESCRIPTION="A simple database API" -HOMEPAGE="http://tdb.samba.org/"; -SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" -IUSE="python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND=" - ${RDEPEND} - app-text/docbook-xml-dtd:4.2" - -WAF_BINARY="${S}/buildtools/bin/waf" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch -} - -src_configure() { - local extra_opts="" - use python || extra_opts+=" --disable-python" - waf-utils_src_configure \ - ${extra_opts} -} - -src_test() { - # the default src_test runs 'make test' and 'make check', letting - # the tests fail occasionally (reason: unknown) - emake check -} diff --git a/sys-libs/tdb/tdb-1.3.0-r99.ebuild b/sys-libs/tdb/tdb-1.3.0-r99.ebuild new file mode 100644 index 0000000..951bec8 --- /dev/null +++ b/sys-libs/tdb/tdb-1.3.0-r99.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.0-r1.ebuild,v 1.14 2015/01/03 12:40:14 mgorny Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads" + +inherit waf-utils multilib-minimal python-single-r1 eutils + +DESCRIPTION="A simple database API" +HOMEPAGE="http://tdb.samba.org/"; +SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm ~mips ppc x86" +IUSE="python" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.2" + +WAF_BINARY="${S}/buildtools/bin/waf" + +src_prepare() { + epatch "${FILESDIR}/add_missing_stdbool_h_include.patch" + epatch "${FILESDIR}/tdb-remove-check-bsd-strtoll.patch" + + python_fix_shebang . + multilib_copy_sources +} + +multilib_src_configure() { + local extra_opts=() + if ! multilib_is_native_abi || ! use python; then + extra_opts+=( --disable-python ) + fi + + waf-utils_src_configure \ + "${extra_opts[@]}" +} + +multilib_src_compile() { + # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses + unset MAKEOPTS + waf-utils_src_compile +} + +multilib_src_test() { + # the default src_test runs 'make test' and 'make check', letting + # the tests fail occasionally (reason: unknown) + emake check +} + +multilib_src_install() { + waf-utils_src_install +}
