lang/tcl83/patches/patch-af

   1 $NetBSD: patch-af,v 1.5 2009/12/17 18:35:27 abs Exp $
   2
   3 --- unix/tcl.m4.orig    2001-10-20 00:24:15.000000000 +0000
   4 +++ unix/tcl.m4
   5 @@ -584,7 +584,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
   6             # results, and the version is kept in special file).
   7
   8             if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
   9 -               system=MP-RAS-`awk '{print $3}' /etc/.relid'`
  10 +               system=MP-RAS-`awk '{print $3}' /etc/.relid`
  11             fi
  12             if test "`uname -s`" = "AIX" ; then
  13                 system=AIX-`uname -v`.`uname -r`
  14 @@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
  15      # Step 3: set configuration options based on system name and version.
  16
  17      do64bit_ok=no
  18 +    TCL_LIB_SPEC_RPATH=""
  19      EXTRA_CFLAGS=""
  20      TCL_EXPORT_FILE_SUFFIX=""
  21      UNSHARED_LIB_SUFFIX=""
  22 @@ -790,6 +791,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  23             LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  24             EXTRA_CFLAGS=""
  25             LDFLAGS=""
  26 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  27 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  28 +           TCL_LIB_VERSIONS_OK=nodots
  29             ;;
  30         IRIX-6.*|IRIX64-6.5*)
  31             SHLIB_CFLAGS=""
  32 @@ -814,6 +818,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  33                 esac
  34                 LDFLAGS="-n32"
  35             fi
  36 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  37 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  38 +           TCL_LIB_VERSIONS_OK=nodots
  39             ;;
  40         IRIX64-6.*)
  41             SHLIB_CFLAGS=""
  42 @@ -824,6 +831,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  43             DL_LIBS=""
  44             LDFLAGS=""
  45             LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  46 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  47 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  48 +           TCL_LIB_VERSIONS_OK=nodots
  49             ;;
  50         Linux*)
  51             SHLIB_CFLAGS="-fPIC"
  52 @@ -865,6 +875,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  53                  EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
  54              fi
  55
  56 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  57 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  58 +           TCL_LIB_VERSIONS_OK=nodots
  59             ;;
  60         GNU*)
  61             SHLIB_CFLAGS="-fPIC"
  62 @@ -910,28 +923,36 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  63             LD_SEARCH_FLAGS=""
  64             ;;
  65         NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
  66 +           if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
  67 +               CFLAGS_OPTIMIZE=-O0
  68 +           fi
  69             # Not available on all versions:  check for include file.
  70             AC_CHECK_HEADER(dlfcn.h, [
  71                 # NetBSD/SPARC needs -fPIC, -fpic will not do.
  72                 SHLIB_CFLAGS="-fPIC"
  73 -               SHLIB_LD="ld -Bshareable -x"
  74                 SHLIB_LD_LIBS=""
  75                 SHLIB_SUFFIX=".so"
  76                 DL_OBJS="tclLoadDl.o"
  77                 DL_LIBS=""
  78                 LDFLAGS=""
  79 -               LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  80                 AC_MSG_CHECKING(for ELF)
  81                 AC_EGREP_CPP(yes, [
  82  #ifdef __ELF__
  83         yes
  84  #endif
  85 -               ],
  86 +               ], [
  87                     AC_MSG_RESULT(yes)
  88 -                   SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
  89 +                   SHLIB_LD='${TCL_CC} -shared -Wl,-x'
  90 +                   LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
  91 +                   TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
  92 +                   SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  93 +               ], [
  94                     AC_MSG_RESULT(no)
  95 +                   SHLIB_LD="ld -Bshareable -x"
  96 +                   LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
  97 +                   TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib"
  98                     SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  99 -               )
 100 +               ])
 101             ], [
 102                 SHLIB_CFLAGS=""
 103                 SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
 104 @@ -949,7 +970,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
 105             UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 106             TCL_LIB_VERSIONS_OK=nodots
 107             ;;
 108 -       FreeBSD-*)
 109 +       FreeBSD-* | DragonFly-*)
 110             # FreeBSD 3.* and greater have ELF.
 111             SHLIB_CFLAGS="-fPIC"
 112             SHLIB_LD="ld -Bshareable -x"
 113 @@ -1129,6 +1150,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
 114             DL_LIBS="-ldl"
 115             LDFLAGS=""
 116             LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 117 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 118 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 119 +           TCL_LIB_VERSIONS_OK=nodots
 120             ;;
 121         SunOS-5*)
 122
 123 @@ -1173,6 +1197,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
 124             else
 125                 LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 126             fi
 127 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 128 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 129 +           TCL_LIB_VERSIONS_OK=nodots
 130             ;;
 131         ULTRIX-4.*)
 132             SHLIB_CFLAGS="-G 0"
 133 @@ -1328,7 +1355,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
 134                     ;;
 135                 IRIX*)
 136                     ;;
 137 -               NetBSD-*|FreeBSD-*|OpenBSD-*)
 138 +               NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
 139                     ;;
 140                 Rhapsody-*|Darwin-*)
 141                     ;;
 142 @@ -1707,7 +1734,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [
 143             # results, and the version is kept in special file).
 144
 145             if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
 146 -               system=MP-RAS-`awk '{print $3}' /etc/.relid'`
 147 +               system=MP-RAS-`awk '{print $3}' /etc/.relid`
 148             fi
 149             if test "`uname -s`" = "AIX" ; then
 150                 system=AIX-`uname -v`.`uname -r`