summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Coie <rac@gentoo.org>2004-09-10 21:46:18 +0000
committerRobert Coie <rac@gentoo.org>2004-09-10 21:46:18 +0000
commit97d2917dd2bd8ff071e95117216c0a67ae2c711e (patch)
tree241c91206dc8bfa42000fa81cb019f6de8f70528 /app-editors/xemacs
parentfix ADDPATH path's (Manifest recommit) (diff)
downloadgentoo-2-97d2917dd2bd8ff071e95117216c0a67ae2c711e.tar.gz
gentoo-2-97d2917dd2bd8ff071e95117216c0a67ae2c711e.tar.bz2
gentoo-2-97d2917dd2bd8ff071e95117216c0a67ae2c711e.zip
robustify gdbm patch
Diffstat (limited to 'app-editors/xemacs')
-rw-r--r--app-editors/xemacs/ChangeLog5
-rw-r--r--app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch15
2 files changed, 12 insertions, 8 deletions
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 8a782be790c6..5734b367d8c5 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/xemacs
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.50 2004/09/03 19:04:54 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.51 2004/09/10 21:46:18 rac Exp $
+
+ 10 Sep 2004; Robert Coie <rac@gentoo.org> files/xemacs-21.4.15-gdbm.patch:
+ modify gdbm patch so it will build against either 1.8.0 or 1.8.3
03 Sep 2004; Robert Coie <rac@gentoo.org> xemacs-21.4.15-r2.ebuild:
keywording amd64 and alpha to match gdbm 1.8.3
diff --git a/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch b/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
index 4ad6c82bd598..180c4160834a 100644
--- a/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
+++ b/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
@@ -1,16 +1,17 @@
---- xemacs-21.4.15/configure.in.orig 2004-01-24 15:37:54.000000000 +1100
-+++ xemacs-21.4.15/configure.in 2004-08-25 11:08:37.532591944 +1000
-@@ -4420,11 +4420,11 @@
- dnl Check for DBM support in libgdbm.
+--- configure.in.orig 2004-09-10 14:38:08.812210820 -0700
++++ configure.in 2004-09-10 14:39:26.267741413 -0700
+@@ -4421,10 +4421,13 @@
if test "$with_database_gdbm" != "no"; then
AC_CHECK_LIB(gdbm, dbm_open, [
-- with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
-+ with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
+ with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
++ AC_CHECK_LIB(gdbm_compat, dbm_open, [
++ with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm -lgdbm_compat"], [
if test "$with_database_gdbm" = "yes"; then
XE_DIE("Required GNU DBM support cannot be provided.")
fi
- with_database_gdbm=no])
-+ with_database_gdbm=no],-lgdbm_compat)
++ with_database_gdbm=no], -lgdbm)
++ ])
fi
dnl Check for DBM support in libc and libdbm.