Bug #319583: DBM support was not actually being built due to bug in upstream autoconf.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 256 insertions, 1 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index c1037ec4f1f9..670646e448bf 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -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)
 
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
index 000000000000..6816448e46fc
--- /dev/null
+++ b/sys-libs/db/db-5.0.21-r1.ebuild
@@ -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
index 000000000000..5405206fc516
--- /dev/null
+++ b/sys-libs/db/files/db-5.0.21-enable-dbm-autoconf.patch
@@ -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}"