set hardcode_direct and hardcode_shlibpath_var in OpenBSD' C++ section too.

This commit is contained in:
brad 2004-08-02 16:38:03 +00:00
parent d4fbb2c80a
commit 56232faf2d
3 changed files with 18 additions and 12 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
$OpenBSD: patch-acinclude_m4,v 1.3 2004/08/02 16:38:03 brad Exp $
--- acinclude.m4.orig Sun Apr 11 01:34:51 2004
+++ acinclude.m4 Mon Aug 2 11:46:29 2004
+++ acinclude.m4 Mon Aug 2 12:34:22 2004
@@ -676,6 +676,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
@ -45,7 +45,7 @@ $OpenBSD: patch-acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
fi
;;
@@ -3204,6 +3215,20 @@ case $host_os in
@@ -3204,6 +3215,22 @@ case $host_os in
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@ -54,6 +54,8 @@ $OpenBSD: patch-acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@ -66,7 +68,7 @@ $OpenBSD: patch-acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
osf3*)
case $cc_basename in
KCC)
@@ -5572,6 +5597,7 @@ $echo "local: *; };" >> $output_objdir/$
@@ -5572,6 +5599,7 @@ $echo "local: *; };" >> $output_objdir/$
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libltdl_acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
$OpenBSD: patch-libltdl_acinclude_m4,v 1.3 2004/08/02 16:38:03 brad Exp $
--- libltdl/acinclude.m4.orig Sun Apr 11 01:35:42 2004
+++ libltdl/acinclude.m4 Mon Aug 2 11:47:05 2004
+++ libltdl/acinclude.m4 Mon Aug 2 12:35:01 2004
@@ -676,6 +676,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
@ -45,7 +45,7 @@ $OpenBSD: patch-libltdl_acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
fi
;;
@@ -3204,6 +3215,20 @@ case $host_os in
@@ -3204,6 +3215,22 @@ case $host_os in
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@ -54,6 +54,8 @@ $OpenBSD: patch-libltdl_acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@ -66,7 +68,7 @@ $OpenBSD: patch-libltdl_acinclude_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
osf3*)
case $cc_basename in
KCC)
@@ -5572,6 +5597,7 @@ $echo "local: *; };" >> $output_objdir/$
@@ -5572,6 +5599,7 @@ $echo "local: *; };" >> $output_objdir/$
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libtool_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
$OpenBSD: patch-libtool_m4,v 1.3 2004/08/02 16:38:03 brad Exp $
--- libtool.m4.orig Thu Apr 1 22:46:14 2004
+++ libtool.m4 Mon Aug 2 11:45:40 2004
+++ libtool.m4 Mon Aug 2 12:33:41 2004
@@ -676,6 +676,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
@ -45,7 +45,7 @@ $OpenBSD: patch-libtool_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
fi
;;
@@ -3204,6 +3215,20 @@ case $host_os in
@@ -3204,6 +3215,22 @@ case $host_os in
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@ -54,6 +54,8 @@ $OpenBSD: patch-libtool_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@ -66,7 +68,7 @@ $OpenBSD: patch-libtool_m4,v 1.2 2004/08/02 15:50:46 brad Exp $
osf3*)
case $cc_basename in
KCC)
@@ -5572,6 +5597,7 @@ $echo "local: *; };" >> $output_objdir/$
@@ -5572,6 +5599,7 @@ $echo "local: *; };" >> $output_objdir/$
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'