Update libtool patches so that libtool recognizes vax as a static libs-only

architecture.
ok espie@
This commit is contained in:
miod 2002-04-03 14:44:14 +00:00
parent eb5605aa35
commit 5bdee43e97
4 changed files with 130 additions and 94 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lt1.3.0-ltconfig,v 1.1 2001/10/31 11:58:04 wilfried Exp $
--- ltconfig.orig Fri Mar 31 22:10:25 2000
+++ ltconfig Mon Oct 29 12:48:18 2001
@@ -499,7 +499,14 @@ fi
$OpenBSD: patch-lt1.3.0-ltconfig,v 1.2 2002/04/03 14:44:14 miod Exp $
--- ltconfig.orig Wed Apr 3 07:47:42 2002
+++ ltconfig Wed Apr 3 07:53:55 2002
@@ -499,7 +499,14 @@
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@ -17,7 +17,7 @@ $OpenBSD: patch-lt1.3.0-ltconfig,v 1.1 2001/10/31 11:58:04 wilfried Exp $
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1061,7 +1068,9 @@ cygwin* | mingw*)
@@ -1061,7 +1068,9 @@
with_gnu_ld=no
fi
;;
@ -28,34 +28,43 @@ $OpenBSD: patch-lt1.3.0-ltconfig,v 1.1 2001/10/31 11:58:04 wilfried Exp $
esac
ld_shlibs=yes
@@ -1317,10 +1326,24 @@ else
@@ -1317,10 +1326,31 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
- hardcode_direct=yes
- hardcode_shlibpath_var=no
+ case "$host_cpu" in
+ m88k|hppa|vax)
+ ld_shlibs=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1857,9 +1880,25 @@ netbsd*)
@@ -1857,9 +1887,25 @@
openbsd*)
version_type=sunos

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lt1.3.3-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
--- ltconfig.orig Thu Jul 15 15:31:35 1999
+++ ltconfig Tue Oct 30 19:31:12 2001
@@ -501,7 +501,14 @@ fi
$OpenBSD: patch-lt1.3.3-ltconfig,v 1.3 2002/04/03 14:44:14 miod Exp $
--- ltconfig.orig Wed Apr 3 07:47:42 2002
+++ ltconfig Wed Apr 3 07:55:04 2002
@@ -501,7 +501,14 @@
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@ -17,7 +17,7 @@ $OpenBSD: patch-lt1.3.3-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
@@ -1105,7 +1112,9 @@
with_gnu_ld=no
fi
;;
@ -28,34 +28,43 @@ $OpenBSD: patch-lt1.3.3-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
esac
ld_shlibs=yes
@@ -1391,10 +1400,24 @@ else
@@ -1391,10 +1400,31 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
- hardcode_direct=yes
- hardcode_shlibpath_var=no
+ case "$host_cpu" in
+ m88k|hppa|vax)
+ ld_shlibs=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1955,9 +1978,25 @@ netbsd*)
@@ -1955,9 +1985,25 @@
openbsd*)
version_type=sunos

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lt1.3.4-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
--- ltconfig.orig Wed Feb 2 19:53:22 2000
+++ ltconfig Tue Oct 30 19:35:58 2001
@@ -501,7 +501,14 @@ fi
$OpenBSD: patch-lt1.3.4-ltconfig,v 1.3 2002/04/03 14:44:14 miod Exp $
--- ltconfig.orig Wed Apr 3 07:47:42 2002
+++ ltconfig Wed Apr 3 07:56:13 2002
@@ -501,7 +501,14 @@
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@ -17,7 +17,7 @@ $OpenBSD: patch-lt1.3.4-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
@@ -1105,7 +1112,9 @@
with_gnu_ld=no
fi
;;
@ -28,34 +28,43 @@ $OpenBSD: patch-lt1.3.4-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
esac
ld_shlibs=yes
@@ -1396,10 +1405,24 @@ else
@@ -1396,10 +1405,31 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
- hardcode_direct=yes
- hardcode_shlibpath_var=no
+ case "$host_cpu" in
+ m88k|hppa|vax)
+ ld_shlibs=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1997,9 +2020,25 @@ netbsd*)
@@ -1997,9 +2027,25 @@
openbsd*)
version_type=sunos

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lt1.3.5-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
--- ltconfig.orig Sat May 27 07:15:00 2000
+++ ltconfig Tue Oct 30 19:39:25 2001
@@ -501,7 +501,14 @@ fi
$OpenBSD: patch-lt1.3.5-ltconfig,v 1.3 2002/04/03 14:44:14 miod Exp $
--- ltconfig.orig Wed Apr 3 07:47:42 2002
+++ ltconfig Wed Apr 3 07:57:21 2002
@@ -501,7 +501,14 @@
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@ -17,7 +17,7 @@ $OpenBSD: patch-lt1.3.5-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
@@ -1105,7 +1112,9 @@
with_gnu_ld=no
fi
;;
@ -28,34 +28,43 @@ $OpenBSD: patch-lt1.3.5-ltconfig,v 1.2 2001/10/31 01:33:33 brad Exp $
esac
ld_shlibs=yes
@@ -1402,10 +1411,24 @@ else
@@ -1402,10 +1411,31 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
- hardcode_direct=yes
- hardcode_shlibpath_var=no
+ case "$host_cpu" in
+ m88k|hppa|vax)
+ ld_shlibs=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2021,9 +2044,25 @@ netbsd*)
@@ -2021,9 +2051,25 @@
openbsd*)
version_type=sunos