From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 1 Jun 2001 15:36:35 +0000 (+0000)
Subject: Retract #10324 and #10333; not needed.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1b96318cf20a01b551ac8519bf1ee01be2296d37;p=p5sagit%2Fp5-mst-13.2.git

Retract #10324 and #10333; not needed.

p4raw-id: //depot/perl@10375
---

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index bac68c3..6f4ca17 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -282,20 +282,6 @@ set `echo X "$libswanted "|sed -e 's/ sun / /' -e 's/ crypt / /' -e 's/ bsd / /'
 shift
 libswanted="$*"
 
-#
-# XXX -- This isn't right, since you still don't want perl itself
-# linked with -ldb, even if you *do* build the DB_File extension.
-# Linking perl with -ldb will prevent you from building the
-# Sybase::DBlib extension, due to a conflict between dbopen() in both
-# libdb.so and libsybdb.so.
-#
-case "$i_db" in
-undef)
-    set `echo X "$libswanted "|sed -e 's/ db / /'`
-    shift
-    libswanted="$*" ;;
-esac
-
 cat > UU/usethreads.cbu <<'EOCBU'
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
diff --git a/hints/linux.sh b/hints/linux.sh
index b8aafd2..a6b2bd9 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -289,45 +289,3 @@ ccflags_uselargefiles="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 	;;
 esac
 EOCBU
-
-# Change by wpm 10 April 2001
-#
-# XXX -- This isn't right, since you still don't want perl itself
-# linked with -ldb, even if you *do* build the DB_File extension.
-# Linking perl with -ldb will prevent you from building the
-# Sybase::DBlib extension, due to a conflict between dbopen() in both
-# libdb.so and libsybdb.so.
-#
-case "$i_db" in
-undef)
-    set `echo X "$libswanted "|sed -e 's/ db / /'`
-    shift
-    libswanted="$*" ;;
-esac
-
-#
-# XXX -- Same is true for libgdbm.  This makes it hard for us to build
-# our own GDBM_File.
-#
-case "$i_gdbm" in
-undef)
-    set `echo X "$libswanted "|sed -e 's/ gdbm / /'`
-    shift
-    libswanted="$*" ;;
-esac
-
-#
-# XXX -- damn.  We also need to strip ndbm as well because:
-#
-# mglnxcs01$ ls -al /usr/lib/*ndbm*
-# lrwxrwxrwx    1 root     wheel           7 Oct  4  2000 /usr/lib/libndbm.a -> libdb.a
-# lrwxrwxrwx    1 root     wheel           8 Oct  4  2000 /usr/lib/libndbm.so -> libdb.so
-#
-case "$i_db" in
-undef)
-    set `echo X "$libswanted "|sed -e 's/ ndbm / /'`
-    shift
-    libswanted="$*" ;;
-esac
-
-