mgorny 14/05/15 18:36:45 Modified: ChangeLog Added: db-5.3.28-r2.ebuild db-4.8.30-r1.ebuild Log: Enable multilib support. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.347 sys-libs/db/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?rev=1.347&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?rev=1.347&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?r1=1.346&r2=1.347 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v retrieving revision 1.346 retrieving revision 1.347 diff -u -r1.346 -r1.347 --- ChangeLog 3 Apr 2014 08:47:19 -0000 1.346 +++ ChangeLog 15 May 2014 18:36:45 -0000 1.347 @@ -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.346 2014/04/03 08:47:19 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.347 2014/05/15 18:36:45 mgorny Exp $ + +*db-4.8.30-r1 (15 May 2014) +*db-5.3.28-r2 (15 May 2014) + + 15 May 2014; Michał Górny <mgo...@gentoo.org> +db-4.8.30-r1.ebuild, + +db-5.3.28-r2.ebuild: + Enable multilib support. *db-5.3.28-r1 (03 Apr 2014) 1.1 sys-libs/db/db-5.3.28-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-5.3.28-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-5.3.28-r2.ebuild?rev=1.1&content-type=text/plain Index: db-5.3.28-r2.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-5.3.28-r2.ebuild,v 1.1 2014/05/15 18:36:45 mgorny Exp $ EAPI=5 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal #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="Sleepycat" SLOT="5.3" 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.4[${MULTILIB_USEDEP}] ) test? ( >=dev-lang/tcl-8.4[${MULTILIB_USEDEP}] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1" RDEPEND="tcl? ( dev-lang/tcl[${MULTILIB_USEDEP}] ) java? ( >=virtual/jre-1.5 )" MULTILIB_WRAPPED_HEADERS=( /usr/include/db5.3/db.h ) src_prepare() { cd "${WORKDIR}"/"${MY_P}" for (( i=1 ; i<=${PATCHNO} ; i++ )) do epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" done # 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 epatch "${FILESDIR}"/${PN}-5.2.28-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 } 1.1 sys-libs/db/db-4.8.30-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-4.8.30-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-4.8.30-r1.ebuild?rev=1.1&content-type=text/plain Index: db-4.8.30-r1.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-4.8.30-r1.ebuild,v 1.1 2014/05/15 18:36:45 mgorny Exp $ EAPI=4 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal #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="${WORKDIR}/${MY_P}/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="Sleepycat" SLOT="4.8" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="doc java cxx tcl test" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.4[${MULTILIB_USEDEP}] ) test? ( >=dev-lang/tcl-8.4[${MULTILIB_USEDEP}] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1" RDEPEND="tcl? ( dev-lang/tcl[${MULTILIB_USEDEP}] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" src_unpack() { unpack "${MY_P}".tar.gz } src_prepare() { cd "${WORKDIR}"/"${MY_P}" || die for (( i=1 ; i<=${PATCHNO} ; i++ )) do epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" done epatch "${FILESDIR}"/${PN}-4.8-libtool.patch epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.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 sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i 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}"/../dist/Makefile.in || die cd "${S}"/../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 sed -i \ -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure || die } 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 ECONF_SOURCE="${S}"/../dist \ STRIP="true" \ econf \ --enable-compat185 \ --enable-o_direct \ --without-uniquename \ $([[ ${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_test() { multilib_is_native_abi || return S=${BUILD_DIR} db_src_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 }
