diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-10-10 13:08:16 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-10-10 13:08:16 +0000 |
| commit | fcc2dad64fc50462bf925634a194ee0ef685f230 (patch) | |
| tree | 413fdbc5c89ae7f819dd58a01616131b24eb2588 /japanese/perl5 | |
| parent | Set BROKEN_ELF. (diff) | |
Integrate patch-ad and patch-ah into patch-ad.
Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
Notes
Notes:
svn path=/head/; revision=13852
Diffstat (limited to 'japanese/perl5')
| -rw-r--r-- | japanese/perl5/files/patch-aa | 11 | ||||
| -rw-r--r-- | japanese/perl5/files/patch-ad | 31 |
2 files changed, 29 insertions, 13 deletions
diff --git a/japanese/perl5/files/patch-aa b/japanese/perl5/files/patch-aa index 63fd5f7b754c..c2c792b46499 100644 --- a/japanese/perl5/files/patch-aa +++ b/japanese/perl5/files/patch-aa @@ -9,17 +9,6 @@ cf_email='' cf_by='' cf_time='' -@@ -818,7 +818,9 @@ - - i_whoami='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth="/usr/lib/386 /lib/386" -+: change the next line if compiling for FreeBSD 3.0 -+xlibpth="/usr/lib/aout $xlibpath" - - : Possible local library directories to search. - loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" @@ -862,7 +864,7 @@ : If anyone needs -lnet, put it in a hint file. libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl' diff --git a/japanese/perl5/files/patch-ad b/japanese/perl5/files/patch-ad index 76bdab280b5b..510e8eee86e3 100644 --- a/japanese/perl5/files/patch-ad +++ b/japanese/perl5/files/patch-ad @@ -1,5 +1,5 @@ ---- hints/freebsd.sh.ORIG Fri Jul 24 06:00:19 1998 -+++ hints/freebsd.sh Thu Jul 30 16:04:24 1998 +--- hints/freebsd.sh.orig Fri Jul 24 13:00:19 1998 ++++ hints/freebsd.sh Sat Oct 10 20:39:02 1998 @@ -68,6 +68,7 @@ d_setreuid='define' d_setegid='undef' @@ -27,3 +27,30 @@ ;; esac +@@ -95,12 +102,20 @@ + case "$osvers" in + 0.*|1.0*) ;; + +-3.0*) if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" +- fi +- cccdlflags='-DPIC -fpic' +- lddlflags='-Bshareable' ++3.0*) objformat=`objformat` ++ if [ x$objformat = xelf ]; then ++ libpth="/usr/lib /usr/local/lib" ++ glibpth="/usr/lib /usr/local/lib" ++ ldflags="-Wl,-E " ++ lddlflags="-shared " ++ else ++ if [ -e /usr/lib/aout ]; then ++ libpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ fi ++ lddlflags='-Bshareable' ++ fi ++ cccdlflags='-DPIC -fpic' + ;; + + *) cccdlflags='-DPIC -fpic' |