Bug #319583: DBM support was not actually being built due to bug in upstream autoconf.
authorRobin H. Johnson <robbat2@gentoo.org>
Fri, 14 May 2010 03:19:25 +0000 (03:19 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Fri, 14 May 2010 03:19:25 +0000 (03:19 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

sys-libs/db/ChangeLog
sys-libs/db/Manifest
sys-libs/db/db-5.0.21-r1.ebuild [new file with mode: 0644]
sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch [new file with mode: 0644]

index c1037ec4f1f9186e3c93983dec5e3e2875f03b64..670646e448bff85da7fefb00c30ec8275eaf9dde 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.303 2010/05/11 08:01:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.304 2010/05/14 03:19:25 robbat2 Exp $
+
+*db-5.0.21-r1 (14 May 2010)
+
+  14 May 2010; Robin H. Johnson <robbat2@gentoo.org> +db-5.0.21-r1.ebuild,
+  +files/db-5.0.21-enable-dbm-autoconf.patch:
+  Bug #319583: DBM support was not actually being built due to bug in
+  upstream autoconf.
 
 *db-5.0.21 (11 May 2010)
 
index ac2b6060833c28d38a16e8366b0bc57f2f1a0b0c..6f90a3799b92d703356d3dfb5436832640a44320 100644 (file)
@@ -24,6 +24,7 @@ AUX db-4.6-jni-check-prefix-first.patch 1172 RMD160 5fe466cce625157517a8e703c3e0
 AUX db-4.6-libtool.patch 1817 RMD160 989536933036b8ea7d4bf55420c49ebad76d703b SHA1 830fc6ecaf948dc1276ee0a539668d6f2e9c9a15 SHA256 7b47ab059b5e9a775e024f6f2562eea136e870a32748675664e5a5315b871b21
 AUX db-4.8-libtool.patch 2076 RMD160 e92a09df1944c5054220c3467c4d3fe558928575 SHA1 af4faf7c990ad85dea0c3e651c8b7a0d0be7078d SHA256 b337c02ffc540e2d692ec57fe093d182f0054a673e5267eabd2db24121486312
 AUX db-4.8.24-java-manifest-location.patch 592 RMD160 8822d3b058f542414b46cdc63e7074ddb8a4a845 SHA1 12f7d6d56d180628d53fc00046f1c2a23b7fd67c SHA256 1589885b89ff465fe752c3062e322638a39ccf1a96c392473c5424cfcc628aea
+AUX db-5.0.21-enable-dbm-autoconf.patch 1757 RMD160 db8cafeda220734e2436bbd2ff51850e291a7160 SHA1 6c82c0b1c9fbfb492349795d9263ac8cc26cad26 SHA256 e4868b2cbdfc881d9822d354e873727bbd824c3aa09c60dd6d6d8102c2bc1323
 AUX patch.3.2.9.1 2139 RMD160 a018e1e91102c972279ec017e1d87d6d87f99a56 SHA1 34108ae9ce03c40c4d1016e9e54690d5d8fc4135 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798
 AUX patch.3.2.9.2 495 RMD160 c9982844d99e1c78efddcb7b7615c41f6225e6b9 SHA1 c447c089f44c401c174244a7f9f7967522ba92a4 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e
 DIST db-1.85-r3.1.patch.bz2 14641 RMD160 463c9d6cf013b28ff2c364d3f2ced378b334fea3 SHA1 95d36410f0fee98f192eee04c2a1f74cac106270 SHA256 88e3095b191fe425d0192d052595ab838ad4ef6324aac0a9e338fd6df7ae40d4
@@ -80,6 +81,7 @@ EBUILD db-4.7.25_p4.ebuild 4353 RMD160 ee5995cda8b373e842b92ca365adb7ad03b3b4e6
 EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA1 968afb91b4c4eef1fc1ee5745a044d38776d0a2e SHA256 ef5d888687d88dab2aac25234df1c6376343aee7d68b9277254d678f043706e5
 EBUILD db-4.8.26.ebuild 4431 RMD160 b5ada7784ee0ff0ecff7bcbd10a72a64abb6271c SHA1 c884f625ead196b4e1afaf428cf394b8008ef4a4 SHA256 ba81971dc4090bc318cdfa6ec02e5dad68693b038a5fa03827f83e677089e5fd
 EBUILD db-4.8.30.ebuild 4431 RMD160 79ad467c23dd37c895542fd4d1cb1839d1dd16dc SHA1 f6e4a3314c118c72aa1da277e1a8c3382c53dbab SHA256 2265aba0c86de5423f17b2b0db0998d14fdcb65a045e9da968b3ecd9840965d2
+EBUILD db-5.0.21-r1.ebuild 5341 RMD160 3447f73996f03d78006879b381bf4094739a1d58 SHA1 927cd54339f20ec134acf53864312528fe22d321 SHA256 8e47b25d2d4daccb1aa285c3bf507b2b5c60784449b4bb94712fbdd7554314bb
 EBUILD db-5.0.21.ebuild 5168 RMD160 66048fd8f16b68a7702e5c27ab3bece72b1862c2 SHA1 38faccd1c9246703c786c0aa6728a2ed92739909 SHA256 458a000903ae979ca6697f0ce834a83eabf17167617717b4477274887d1c2d64
-MISC ChangeLog 47595 RMD160 334024d016db68ff5ca7e55e032694f97cf8def1 SHA1 b824a16b1ae9984124bc0c3f8f7c2555ecce0008 SHA256 b4dbefa37d73221fae6f59c67b8880e76ca02900359a9aa81ab6c3654c248f87
+MISC ChangeLog 47837 RMD160 3c8d06b450d43592fc19fa0fc20aa8cfa900d537 SHA1 bc4d064b5cc11a8f50942f73daf8a9a0713cc2cf SHA256 cd7f66a85747658d910cf77c8c054789d183c45c1e96d9fed5c349337d333b82
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-5.0.21-r1.ebuild b/sys-libs/db/db-5.0.21-r1.ebuild
new file mode 100644 (file)
index 0000000..6816448
--- /dev/null
@@ -0,0 +1,199 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild,v 1.1 2010/05/14 03:19:25 robbat2 Exp $
+
+EAPI=2
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
+
+#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="OracleDB"
+SLOT="5.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc java nocxx tcl test"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+       test? ( >=dev-lang/tcl-8.4 )
+       java? ( >=virtual/jdk-1.5 )
+       >=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( dev-lang/tcl )
+       java? ( >=virtual/jre-1.5 )"
+
+src_unpack() {
+       unpack "${MY_P}".tar.gz
+}
+
+src_prepare() {
+       cd "${WORKDIR}"/"${MY_P}"
+       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
+
+       # 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
+
+       # upstream autoconf fails to build DBM when it's supposed to
+       epatch "${FILESDIR}"/${PN}-5.0.21-enable-dbm-autoconf.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
+
+       # 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
+
+       cd "${S_BASE}"/dist
+       rm -f aclocal/libtool.m4
+       sed -i \
+               -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+               configure.ac
+       sed -i \
+               -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+               aclocal/programs.m4
+       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
+       done
+}
+
+src_configure() {
+       local myconf=''
+
+       # compilation with -O0 fails on amd64, see bug #171231
+       if use amd64; then
+               replace-flags -O0 -O2
+               is-flagq -O[s123] || append-flags -O2
+       fi
+
+       # use `set` here since the java opts will contain whitespace
+       set --
+       if use java ; then
+               set -- "$@" \
+                       --with-java-prefix="${JAVA_HOME}" \
+                       --with-javac-flags="$(java-pkg_javac-args)"
+       fi
+
+       # 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
+
+       # Bug #270851: test needs TCL support
+       if use tcl || use test ; then
+               myconf="${myconf} --enable-tcl"
+               myconf="${myconf} --with-tcl=/usr/$(get_libdir)"
+       else
+               myconf="${myconf} --disable-tcl"
+       fi
+
+       # sql_compat will cause a collision with sqlite3
+       # --enable-sql_compat
+       cd "${S}"
+       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 \
+               $(use arm && echo --with-mutex=ARM/gcc-assembly) \
+               $(use amd64 && echo --with-mutex=x86/gcc-assembly) \
+               $(use_enable !nocxx cxx) \
+               $(use_enable !nocxx stl) \
+               $(use_enable java) \
+               ${myconf} \
+               $(use_enable test) \
+               "$@"
+}
+
+src_compile() {
+       emake || die "make failed"
+}
+
+src_install() {
+       emake install DESTDIR="${D}" || die
+
+       db_src_install_usrbinslot
+
+       db_src_install_headerslot
+
+       db_src_install_doc
+
+       db_src_install_usrlibcleanup
+
+       dodir /usr/sbin
+       # This file is not always built, and no longer exists as of db-4.8
+       [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
+       mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
+
+       if 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
+}
+
+pkg_postinst() {
+       db_fix_so
+}
+
+pkg_postrm() {
+       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
+       egrep -ril \
+               'open_site_prog|setup_site_prog|db_repsite' \
+               "${S_BASE}/test" \
+               | xargs egrep -l '^# TEST ' \
+               | xargs rename .tcl .tcl.DISABLED
+
+       db_src_test
+}
diff --git a/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch b/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch
new file mode 100644 (file)
index 0000000..5405206
--- /dev/null
@@ -0,0 +1,49 @@
+The autoconf from upstream never built DBM even if you wanted it, because
+enable_build_dbm was never true with --enable-dbm. The only time you actually
+got it before was when you had selected the testsuite.
+
+Fixed up that, and the entire reversed logic, and just throw away the useless
+db_cv_build_dbm variable entirely.
+
+Correct logic is:
+if(--enable-dbm || --enable-test) { 
+       Build DBM
+}
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar db-5.0.21.orig//dist/aclocal/options.m4 db-5.0.21//dist/aclocal/options.m4
+--- db-5.0.21.orig//dist/aclocal/options.m4    2010-03-30 10:36:10.000000000 -0700
++++ db-5.0.21//dist/aclocal/options.m4 2010-05-13 13:49:23.889947877 -0700
+@@ -274,15 +274,11 @@
+ AC_MSG_RESULT($db_cv_test)
+ 
+ AC_MSG_CHECKING(if --enable-dbm option specified)
+-AC_ARG_ENABLE(build_dbm,
++AC_ARG_ENABLE(dbm,
+       [AC_HELP_STRING([--enable-dbm],
+                       [Configure to enable the historic dbm interface.])],
+-      [db_cv_build_dbm="$enable_dbm"], enableval="$db_cv_test")
+-db_cv_build_dbm="$enableval"
+-case "$enableval" in
+- no) AC_MSG_RESULT(yes);;
+-yes) AC_MSG_RESULT(no);;
+-esac
++      [db_cv_dbm="$enable_dbm"], [db_cv_dbm="$db_cv_test"])
++AC_MSG_RESULT($db_cv_dbm)
+ 
+ AC_MSG_CHECKING(if --enable-dtrace option specified)
+ AC_ARG_ENABLE(dtrace,
+diff -Nuar db-5.0.21.orig//dist/configure.ac db-5.0.21//dist/configure.ac
+--- db-5.0.21.orig//dist/configure.ac  2010-05-13 13:41:26.415822427 -0700
++++ db-5.0.21//dist/configure.ac       2010-05-13 13:48:59.185822961 -0700
+@@ -973,7 +973,8 @@
+ fi
+ 
+ # The DBM API can be disabled.
+-if test "$db_cv_build_dbm" = "yes"; then
++
++if test "$db_cv_dbm" = "yes"; then
+       AC_DEFINE(HAVE_DBM)
+       AH_TEMPLATE(HAVE_DBM, [Define to 1 if building the DBM API.])
+       ADDITIONAL_OBJS="$ADDITIONAL_OBJS dbm${o} hsearch${o}"