robbat2 14/08/04 20:45:13 Modified: ChangeLog Added: db-6.1.19.ebuild Log: Add 6.1.19 into the tree, in p.mask as upstream testsuite still has failures, maybe a later 6.1 will be better. (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.357 sys-libs/db/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?rev=1.357&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?rev=1.357&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?r1=1.356&r2=1.357 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v retrieving revision 1.356 retrieving revision 1.357 diff -p -w -b -B -u -u -r1.356 -r1.357 --- ChangeLog 4 Aug 2014 19:28:47 -0000 1.356 +++ ChangeLog 4 Aug 2014 20:45:13 -0000 1.357 @@ -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 <robb...@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 <robb...@gentoo.org> -db-5.2.42-r1.ebuild, -db-5.2.42.ebuild: 1.1 sys-libs/db/db-6.1.19.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-6.1.19.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-6.1.19.ebuild?rev=1.1&content-type=text/plain Index: db-6.1.19.ebuild =================================================================== # 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 }
