diff options
Diffstat (limited to 'lang/tcl82/files/patch-ab')
-rw-r--r-- | lang/tcl82/files/patch-ab | 149 |
1 files changed, 94 insertions, 55 deletions
diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab index 551b0c24760a..d3d9bb55b69f 100644 --- a/lang/tcl82/files/patch-ab +++ b/lang/tcl82/files/patch-ab @@ -1,59 +1,98 @@ ---- configure.orig Fri Apr 30 08:23:33 1999 -+++ configure Tue May 11 01:25:32 1999 -@@ -4384,7 +4384,7 @@ - LD_FLAGS="-Wl,-Bexport" - LD_SEARCH_FLAGS="" - ;; -- NetBSD-*|FreeBSD-12.*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*) - # Not available on all versions: check for include file. - ac_safe=`echo "dlfcn.h" | tr './\055' '___'` +--- configure.orig Fri Aug 13 18:02:47 1999 ++++ configure Sat Sep 4 13:15:50 1999 +@@ -4648,7 +4648,7 @@ + EXTRA_CFLAGS="" + TCL_EXPORT_FILE_SUFFIX="" + UNSHARED_LIB_SUFFIX="" +- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ++ TCL_TRIM_DOTS=82 + ECHO_VERSION='`echo ${VERSION}`' + TCL_LIB_VERSIONS_OK=ok + CFLAGS_DEBUG=-g +@@ -4892,7 +4892,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -4413,14 +4413,19 @@ +@@ -4922,16 +4922,21 @@ + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LD_FLAGS="" - LD_SEARCH_FLAGS="" -- TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' -+ SHLIB_LD="ld -shared -x -soname \$@" -+ else -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHLIB_LD="ld -Bshareable -x" -+ fi - +- + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ echo "SHARED_LIB_SUFFIX JSEGER" ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else echo "$ac_t""no" 1>&6 -@@ -4443,17 +4448,6 @@ - TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; -- FreeBSD-*) -- # FreeBSD 3.* and greater have ELF. -- SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- LD_FLAGS="" -- LD_SEARCH_FLAGS="" -- ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" - SHLIB_LD="cc -nostdlib -r" -@@ -5100,6 +5094,7 @@ - # stub support. - #-------------------------------------------------------------------- - # Replace ${VERSION} with contents of ${TCL_VERSION} -+${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0 - eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" - # Replace DBGX with TCL_DBGX - eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" +@@ -4954,17 +4959,6 @@ + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots + ;; +- FreeBSD-*) +- # FreeBSD 3.* and greater have ELF. +- SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" +- SHLIB_LD_LIBS="" +- SHLIB_SUFFIX=".so" +- DL_OBJS="tclLoadDl.o" +- DL_LIBS="" +- LDFLAGS="" +- LD_SEARCH_FLAGS="" +- ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" + SHLIB_LD="cc -nostdlib -r" +@@ -5371,7 +5365,7 @@ + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' + fi + if test "$UNSHARED_LIB_SUFFIX" = "" ; then +- UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + fi + + +@@ -5628,11 +5622,7 @@ + # up the Tcl library. + + if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then +- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" +- else +- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +- fi ++ TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}" + TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" + TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" + else +@@ -5678,11 +5668,7 @@ + + TCL_STUB_LIB_FILE=${STUB_LIB_FILE} + +-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" +-else +- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +-fi ++TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}" + + TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}" + TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}" |