diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2014-08-04 20:45:21 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-08-04 20:45:21 +0000 |
commit | b965b6720a302c12288a92a62f99c5eb5c34291e (patch) | |
tree | dfbcb8ce6d69bbf4ad0ba7ab769acd0d6e10bd01 /sys-libs/db | |
parent | New mask for upcoming db-6.1, that is not ready at upstream yet, still fails ... (diff) | |
download | historical-b965b6720a302c12288a92a62f99c5eb5c34291e.tar.gz historical-b965b6720a302c12288a92a62f99c5eb5c34291e.tar.bz2 historical-b965b6720a302c12288a92a62f99c5eb5c34291e.zip |
Add 6.1.19 into the tree, in p.mask as upstream testsuite still has failures, maybe a later 6.1 will be better.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/db')
-rw-r--r-- | sys-libs/db/ChangeLog | 9 | ||||
-rw-r--r-- | sys-libs/db/Manifest | 5 | ||||
-rw-r--r-- | sys-libs/db/db-6.1.19.ebuild | 233 | ||||
-rw-r--r-- | sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch | 10 |
4 files changed, 255 insertions, 2 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog index 31ea5c7dc74e..6f5f8fa37849 100644 --- a/sys-libs/db/ChangeLog +++ b/sys-libs/db/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-libs/db # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.356 2014/08/04 19:28:47 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.357 2014/08/04 20:45:13 robbat2 Exp $ + +*db-6.1.19 (04 Aug 2014) + + 04 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> +db-6.1.19.ebuild, + +files/db-6.1.19-sqlite-configure-path.patch: + Add 6.1.19 into the tree, in p.mask as upstream testsuite still has failures, + maybe a later 6.1 will be better. 04 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> -db-5.2.42-r1.ebuild, -db-5.2.42.ebuild: diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index d47001e245d4..386560af909a 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -29,6 +29,7 @@ AUX db-5.0.21-enable-dbm-autoconf.patch 1757 SHA256 e4868b2cbdfc881d9822d354e873 AUX db-5.2.28-sqlite-configure-path.patch 906 SHA256 94e36064e3414d644cc1a157c011a80fdf28df66b0da4b7df69d078735d152fe SHA512 ed0e683313f780975b3aec60018b08569ebdd38e4cdf60de170ef0bc4fc63d602e7a5572792f2634f3680e763b74ffdb0a5b484562a10a4b82b28b19c3acc565 WHIRLPOOL d557e9040e05b1543cc1cf8b9a2ab4d033498004924115be37ad781a1765acc740abd230cf44a196aa1072ab63c57044f7fb84e651436d03cbe0cd8055819e6c AUX db-6.0.19-sqlite-configure-path.patch 754 SHA256 8af56358e09da952eba2f1784c1bb2d1bd671a8c2b6777065aff473bcdca7145 SHA512 c4bf556e65f64ba7667dc3eecfbde37b7ec76a5ff6a4bab3d3ca496107466d82027884a02dc012a0c3873fc505aae7519b9ea721eb84a1855b15f54b2a4ac148 WHIRLPOOL f95cbbc97e27453c354f858be288462e807bbd811a997057bb97d61ff6556ee0438e6313295c60e9f1f4f5b580fd80de3516ff6a5cbf522258ccbf9b95420951 AUX db-6.0.20-test-link.patch 1568 SHA256 cbfa6444aea5927328f1dc8942d082582dbfc0b39b5a93406a310aedfe9b6c3b SHA512 0e091949a071e76439cae4bb37cfdd6c4e4f586c15adbaa6d5d1c9cca5a4982f8e5960d968b41c4368d99556a95b172a6ef1331daf90fb87a77567fc7343f980 WHIRLPOOL e3c66e554c0ae78208508847e90aa922f6b9c30a797049511bfe76da8cec368d5bf3e32369556d2df5a93b40e724da58dac3713ad59ccc8d03adde847beeb116 +AUX db-6.1.19-sqlite-configure-path.patch 727 SHA256 638611333e1620b3acae20e0b0ffedb786fcc42065becea0edb0494d0e74e55c SHA512 6d15c1ec5726998001a6dfa6679bd6f55fe70dc16b1cc531709ba49ee962531e3b4e4bd91ac3a5ea0d1b0736632e66269638651e42a3bbf7697785cecb87aff7 WHIRLPOOL 9ca94a1ad48617259096d3d94936b864a1a44744c1638ea5b2f86ae45ddef4487e3c6624048ff3f7659fae5ecd7bcaacf6f9891d2232ff5c7cc6205817e059fe DIST db-1.85-r3.1.patch.bz2 14641 SHA256 88e3095b191fe425d0192d052595ab838ad4ef6324aac0a9e338fd6df7ae40d4 SHA512 32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4 WHIRLPOOL 3c3437cd4a6294c2ca6db3b6522c4999d5efd9c1807b499b72bba7534c658349bd7f889912b0dbc4bc017fcc5f6d2062ec112ebf044673802bc0d9476ee26dfb DIST db-3.2.9.tar.gz 2085238 SHA256 3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108 SHA512 5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95 WHIRLPOOL 248641e75420fc353d3ace86b3c65ee8354b073e2dddc7d71c1d2ea4681d81306255077dd7ed322a2b5ad8b87d356fa5aba864e5f24dc956133d563e2bba96bd DIST db-4.2.52.tar.gz 4073147 SHA256 72f581d8b91da900434629886d1d1c6ea8b9d2a9329368c3b875e7cd556b6a0e SHA512 47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1 WHIRLPOOL 409df946378054ccca9e5f27980f28da410f9dad9ffa7acaf092725779897fe89a2ac7a4add4a7974271e1d82bc9255681fb1b6cde94782feae86b7f73f8e8f7 @@ -42,6 +43,7 @@ DIST db-4.8.30.tar.gz 22887305 SHA256 e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f DIST db-5.1.29.tar.gz 32188074 SHA256 a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0 WHIRLPOOL c2c5e335a8ed85f9dd947eb8225148c9633d21f5e17d321a6938b50d4bf061e735563cdbefb8c8aa457923ef80e778f95ad80aba4a92a381432ecf52c2a25353 DIST db-5.3.28.tar.gz 35090431 SHA256 e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 WHIRLPOOL ad9042c4509ece1cae42ade4734f69d59a9ec946a85bd486063a7e8f9fa1ae3f925b71f0475fef05a27d33f695ef82ffd06fbaadbd7dc5bfaa77a8caacf9d1dc DIST db-6.0.30.tar.gz 36584356 SHA256 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 SHA512 ea249c59dba18cad391f523840028ba8ef962c32f2c7470942d52f9c07f18ba9fdf964dcd545cb7f2d6c66b91924a0ba1478af1d8f81f0dcbbf94c97ac515cf9 WHIRLPOOL 6784730d250dd480bacf78e966c6acb2fb3ca2c3989668e9440a0a60376b009850b2b48fc35f47e3964b175e78501d18b1c3e3b265831165083fe2dd04a46eb3 +DIST db-6.1.19.tar.gz 37492835 SHA256 ad8aa5f9ede68118732f78718128e29e4d765e46a87dce54fa9143d9de8684ce SHA512 6b8340c91768238e50969388d42d355f71f69ebf598916623ef7acacd9ee6150e214d78f04bd2bf3803c459e86680db07d43b8c6a4e8f5750f72b94481575adf WHIRLPOOL 66e2fc70ff362cf7c36f9ecf4ef9c3ebb60ce8fa0db9e08d7aa80f8aa74a087a9b53614a830d79e7f88aaac2e8b207f2a0933b9f15b134148261e9bb9a76865e DIST db.1.85.tar.gz 270953 SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e WHIRLPOOL 802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352 DIST patch.3.2.9.1 2139 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9 WHIRLPOOL 3a879d5306403739465550ade1fbf53ac62b832fbdf507a204fef13949bc7be9c35ddd972834d3ca74bf17c421791011200556dffd95265eb64849f1d7b647ec DIST patch.3.2.9.2 495 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e SHA512 cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557 WHIRLPOOL 1362c32dc16875a97b451ff52415fe4b9e9d37b256a92c7e86c14a52431937352ae55ecee4361459e9036b9bea238c205a8f0d4406ac7e47387a8cda22906879 @@ -82,5 +84,6 @@ EBUILD db-5.3.28-r1.ebuild 6086 SHA256 0fcc323de3ca62f743580b114d88e8dcd3c59d5d7 EBUILD db-5.3.28-r2.ebuild 6590 SHA256 4ab811618daaa0112aafea7cfc4473fc7b47d73a9262b5e2bd7a0eeb314b99f8 SHA512 c8751d1bba9cd54ae57acf415b9e546887d5967a3a53fad044b4bd90f3dd6d9e071aee3109a2e20ec3cfc451e1dd18c9e32ef48c976cb8a6bdcf31feb72125c6 WHIRLPOOL 893f0e8dca47e06f4a39de2c403cc14271fb9cbc092469c887f34fee2797217b6638e9cb3ffcd90d62315557275804ed0d51adf657df499ab3e85e9f9cf5e892 EBUILD db-6.0.30-r1.ebuild 6705 SHA256 d355f9e7910b3f1cde7f5fde08bb4f4fd76a486f5ff09677648a066ac634c60f SHA512 8213f23a60f4c32d9809441acfd7450f828d44f69ddbbc467fe1b714ff01a32a116368d59a0187c01fc7f6fa761afa333067c46e3f7b981171a4b6e2e6d91cce WHIRLPOOL c330e3bb2ab0be8be3e2f5a661ba8e1511a4eed5cfc35b4bce9692cdeb6cf1e1052b405c7f5c53ee44d371eb2e69750e20f70a6ccd850c308df0e8ab01592fdd EBUILD db-6.0.30.ebuild 6714 SHA256 29bf09b815b4ebff90a9c8cff2b2f5342a567f147f02f24f759535620e18ca00 SHA512 eb3dae0caf8affbbbb33f72c605e464ce40780602b9ac8409f1cefe3e785f210a7d5ea910a6905709e6a564675cf8c7dc1a8e9f544c4d6283e2e55bb0f7a0df9 WHIRLPOOL 056531e5e6dd67880778ab5e009a4aaaac6f417274441192fea4e2a71c8357ef8581fd7abbaa826ae322ae42eaade7f4b7c0cd3b1d8295886fd5567e71e2ead3 -MISC ChangeLog 58158 SHA256 1ff534ca65a4af8a5bc6060473c721a1f7f1b909b5e2e2932243830b8c830813 SHA512 213b9a558f44490b4bf75e13144dc3f8f8ad4bdf7b67de8c13fd231b367cdc67ea737dc3857ffbd2ed76bdd7c08f7fccd9755fda13ec6b50c886d875d24417f6 WHIRLPOOL c56d17b7cac322a4b1dc9860ecb2777dff8251aa0b908b5a8ab8605a6c431d78dfdfe7d6d8637e21f2711d0ceb9892f1bedc8fbb2ee9677ab596f8d9f837344e +EBUILD db-6.1.19.ebuild 6702 SHA256 67bc682e70b83ad27768b5c21aee4b74ce1d7773cdca9dcc6dc5cbae48c4283d SHA512 1dd04a90487dd0f0266a77f72214ad195e4f463dc52eac5b2c6746b99654b0df14281fac639a047b6ade07394a01721369eafd846aaae94763a7897b7d3f3dd8 WHIRLPOOL f8e77873b146ed9ec97f614ac6feaac42e5a539a418460f7ade47b4a37cab20fce40564d8bf65ff6d5bc3a61ddf21727b9456b8dd21a7c1d588dfb39a52d9908 +MISC ChangeLog 58421 SHA256 f70c399a349ec92a62d51722277aac1c0380ed45cd7968748839add7852d3fbd SHA512 c3bea6d4c010eff4009a847a9ba37c3eb7cc61ca5bc69cc61d6979d1184ad08ded63007df29ebc2bc1ecce8f7461a3d3c5e1a18c333fc0df8529afe71b6bdecf WHIRLPOOL 4f96387378596f13afc6f93b9f521deac3837fea117ce9b17305908327919eaf17d2b958e34331434ae1bb082a2d0ed8feac98d1c1f7b350a246518a1e76a8a1 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54 diff --git a/sys-libs/db/db-6.1.19.ebuild b/sys-libs/db/db-6.1.19.ebuild new file mode 100644 index 000000000000..26a8177a0eef --- /dev/null +++ b/sys-libs/db/db-6.1.19.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.1.19.ebuild,v 1.1 2014/08/04 20:45:13 robbat2 Exp $ + +EAPI=5 +inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator + +#Number of official patches +#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` +PATCHNO=${PV/*.*.*_p} +if [[ ${PATCHNO} == "${PV}" ]] ; then + MY_PV=${PV} + MY_P=${P} + PATCHNO=0 +else + MY_PV=${PV/_p${PATCHNO}} + MY_P=${PN}-${MY_PV} +fi + +S_BASE="${WORKDIR}/${MY_P}" +S="${S_BASE}/build_unix" +DESCRIPTION="Oracle Berkeley DB" +HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" +for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do + export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" +done + +LICENSE="AGPL-3" +SLOT="$(get_version_component_range 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="doc java cxx tcl test" + +REQUIRED_USE="test? ( tcl )" + +# the entire testsuite needs the TCL functionality +DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] ) + test? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jdk-1.5 ) + >=sys-devel/binutils-2.16.1" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jre-1.5 )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/db$(get_version_component_range 1-2)/db.h +) + +src_prepare() { + cd "${WORKDIR}"/"${MY_P}" + for (( i=1 ; i<=${PATCHNO} ; i++ )) + do + epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" + done + + # bug #510506 + epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch + + # use the includes from the prefix + epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch + epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch + + # sqlite configure call has an extra leading .. + # upstreamed:5.2.36, missing in 5.3.x/6.x + # still needs to be patched in 6.0.20 + epatch "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch + + # The upstream testsuite copies .lib and the binaries for each parallel test + # core, ~300MB each. This patch uses links instead, saves a lot of space. + epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch + + # Upstream release script grabs the dates when the script was run, so lets + # end-run them to keep the date the same. + export REAL_DB_RELEASE_DATE="$(awk \ + '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ + "${S_BASE}"/dist/configure)" + sed -r -i \ + -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ + "${S_BASE}"/dist/RELEASE || die + + # Include the SLOT for Java JAR files + # This supersedes the unused jarlocation patches. + sed -r -i \ + -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ + "${S_BASE}"/dist/Makefile.in || die + + cd "${S_BASE}"/dist || die + rm -f aclocal/libtool.m4 + sed -i \ + -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ + configure.ac || die + sed -i \ + -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ + aclocal/programs.m4 || die + AT_M4DIR="aclocal aclocal_java" eautoreconf + # Upstream sucks - they do autoconf and THEN replace the version variables. + . ./RELEASE + for v in \ + DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ + DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ + DB_VERSION \ + DB_RELEASE_DATE ; do + local ev="__EDIT_${v}__" + sed -i -e "s/${ev}/${!v}/g" configure || die + done +} + +src_configure() { + # Add linker versions to the symbols. Easier to do, and safer than header file + # mumbo jumbo. + if use userland_GNU ; then + append-ldflags -Wl,--default-symver + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=() + + # compilation with -O0 fails on amd64, see bug #171231 + if [[ ${ABI} == amd64 ]]; then + local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} + replace-flags -O0 -O2 + is-flagq -O[s123] || append-flags -O2 + fi + + # use `set` here since the java opts will contain whitespace + if multilib_is_native_abi && use java ; then + myconf+=( + --with-java-prefix="${JAVA_HOME}" + --with-javac-flags="$(java-pkg_javac-args)" + ) + fi + + # Bug #270851: test needs TCL support + if use tcl || use test ; then + myconf+=( + --enable-tcl + --with-tcl=/usr/$(get_libdir) + ) + else + myconf+=(--disable-tcl ) + fi + + # sql_compat will cause a collision with sqlite3 + # --enable-sql_compat + ECONF_SOURCE="${S_BASE}"/dist \ + STRIP="true" \ + econf \ + --enable-compat185 \ + --enable-dbm \ + --enable-o_direct \ + --without-uniquename \ + --enable-sql \ + --enable-sql_codegen \ + --disable-sql_compat \ + $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \ + $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \ + $(use_enable cxx) \ + $(use_enable cxx stl) \ + $(multilib_native_use_enable java) \ + "${myconf[@]}" \ + $(use_enable test) +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + db_src_install_headerslot + + db_src_install_usrlibcleanup + + if multilib_is_native_abi && use java; then + java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so + java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar + rm -f "${D}"/usr/"$(get_libdir)"/*.jar + fi +} + +multilib_src_install_all() { + db_src_install_usrbinslot + + db_src_install_doc + + dodir /usr/sbin + # This file is not always built, and no longer exists as of db-4.8 + if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then + mv "${D}"/usr/bin/berkeley_db_svc \ + "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die + fi +} + +pkg_postinst() { + multilib_foreach_abi db_fix_so +} + +pkg_postrm() { + multilib_foreach_abi db_fix_so +} + +src_test() { + # db_repsite is impossible to build, as upstream strips those sources. + # db_repsite is used directly in the setup_site_prog, + # setup_site_prog is called from open_site_prog + # which is called only from tests in the multi_repmgr group. + #sed -ri \ + # -e '/set subs/s,multi_repmgr,,g' \ + # "${S_BASE}/test/testparams.tcl" + sed -ri \ + -e '/multi_repmgr/d' \ + "${S_BASE}/test/tcl/test.tcl" || die + + # This is the only failure in 5.2.28 so far, and looks like a false positive. + # Repmgr018 (btree): Test of repmgr stats. + # Repmgr018.a: Start a master. + # Repmgr018.b: Start a client. + # Repmgr018.c: Run some transactions at master. + # Rep_test: btree 20 key/data pairs starting at 0 + # Rep_test.a: put/get loop + # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 + sed -ri \ + -e '/set parms.*repmgr018/d' \ + -e 's/repmgr018//g' \ + "${S_BASE}/test/tcl/test.tcl" || die + + multilib-minimal_src_test +} + +multilib_src_test() { + multilib_is_native_abi || return + + S=${BUILD_DIR} db_src_test +} diff --git a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch new file mode 100644 index 000000000000..25854c53e160 --- /dev/null +++ b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch @@ -0,0 +1,10 @@ +--- db-6.1.19/dist/aclocal/sql.m4 ++++ db-6.1.19/dist/aclocal/sql.m4 +@@ -96,6 +96,6 @@ + if test "$db_cv_build_cryptography" = "yes"; then + CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" + fi +-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1 ++(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1 + + # Configure JDBC if --enable-jdbc |