summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Brocard <acme@astray.com>2004-01-25 08:15:58 +0000
committerLeon Brocard <acme@astray.com>2004-01-25 08:15:58 +0000
commitd69abffa14dcf095e5ca7397f5e1b00667547d9a (patch)
tree12a11cf1b9d500f11c74fa1b89831251d833ac86
parentc6397d29670e1d124eddc296aa155d88a082ef20 (diff)
downloadperl-d69abffa14dcf095e5ca7397f5e1b00667547d9a.tar.gz
Applied patch by Andrew Dougherty to not install into /usr
and use -fPIC instead of -fpic under SPARC (under Linux) p4raw-id: //depot/maint-5.005/perl@22212
-rw-r--r--hints/linux.sh22
1 files changed, 12 insertions, 10 deletions
diff --git a/hints/linux.sh b/hints/linux.sh
index a5817b5f73..06944ed075 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -6,11 +6,11 @@
# Additional info from Nigel Head <nhead@ESOC.bitnet>
# and Kenneth Albanowski <kjahds@kjahds.com>
#
-# Consolidated by Andy Dougherty <doughera@lafcol.lafayette.edu>
+# Consolidated by Andy Dougherty <doughera@lafayette.edu>
#
# Updated Thu Feb 8 11:56:10 EST 1996
-# Updated Thu May 30 10:50:22 EDT 1996 by <doughera@lafcol.lafayette.edu>
+# Updated Thu May 30 10:50:22 EDT 1996 by <doughera@lafayette.edu>
# Updated Fri Jun 21 11:07:54 EDT 1996
# NDBM support for ELF renabled by <kjahds@kjahds.com>
@@ -39,14 +39,6 @@ d_suidsafe='undef'
# do the implicit mapping.
ignore_versioned_solibs='y'
-# perl goes into the /usr tree. See the Filesystem Standard
-# available via anonymous FTP at tsx-11.mit.edu in
-# /pub/linux/docs/linux-standards/fsstnd.
-# Allow a command line override, e.g. Configure -Dprefix=/foo/bar
-case "$prefix" in
-'') prefix='/usr' ;;
-esac
-
# gcc-2.6.3 defines _G_HAVE_BOOL to 1, but doesn't actually supply bool.
ccflags="-Dbool=char -DHAS_BOOL $ccflags"
@@ -226,6 +218,16 @@ fi
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
#esac
+# On the SPARC architecture, -fpic is not enough; -fPIC is needed.
+case "`uname -m`" in
+sparc*)
+ case "$cccdlflags" in
+ *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
+ *) cccdlflags="$cccdlflags -fPIC" ;;
+ esac
+ ;;
+esac
+
# This script UU/usethreads.cbu will get 'called-back' by Configure
# after it has prompted the user for whether to use threads.
cat > UU/usethreads.cbu <<'EOCBU'