diff options
Diffstat (limited to 'lang/tcl/patches/patch-af')
-rw-r--r-- | lang/tcl/patches/patch-af | 69 |
1 files changed, 42 insertions, 27 deletions
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af index 32fa842d3bc..bee8b668303 100644 --- a/lang/tcl/patches/patch-af +++ b/lang/tcl/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ +$NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ ---- tcl.m4.orig Fri Oct 19 19:24:15 2001 +--- tcl.m4.orig Fri Nov 21 14:17:14 2003 +++ tcl.m4 -@@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ +@@ -795,6 +795,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,8 +10,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -790,6 +791,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +@@ -1059,6 +1060,9 @@ dnl AC_CHECK_TOOL(AR, ar) + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' @@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ ;; IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" -@@ -814,6 +818,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -1084,6 +1088,9 @@ dnl AC_CHECK_TOOL(AR, ar) esac LDFLAGS="-n32" fi @@ -30,19 +30,19 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -824,6 +831,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) - DL_LIBS="" - LDFLAGS="" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +@@ -1108,6 +1115,9 @@ dnl AC_CHECK_TOOL(AR, ar) + LDFLAGS="-64" + fi + fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -865,6 +875,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) - EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" - fi +@@ -1154,6 +1164,9 @@ dnl AC_CHECK_TOOL(AR, ar) + # XIM peeking works under XFree86. + AC_DEFINE(PEEK_XCLOSEIM) + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' @@ -50,7 +50,7 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -910,28 +923,36 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -1203,29 +1216,37 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*) @@ -67,7 +67,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ DL_OBJS="tclLoadDl.o" DL_LIBS="" LDFLAGS="" -- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' AC_MSG_CHECKING(for ELF) AC_EGREP_CPP(yes, [ #ifdef __ELF__ @@ -92,18 +93,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ ], [ SHLIB_CFLAGS="" SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -1129,6 +1150,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) - DL_LIBS="-ldl" - LDFLAGS="" - LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - SunOS-5*) - -@@ -1173,6 +1197,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) - else +@@ -1519,6 +1540,9 @@ dnl AC_CHECK_TOOL(AR, ar) + CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' @@ -112,3 +103,27 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" +@@ -1703,8 +1727,8 @@ dnl AC_CHECK_TOOL(AR, ar) + + if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then + LIB_SUFFIX=${SHARED_LIB_SUFFIX} +- MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' +- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' ++ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' ++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' + else + LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} + +@@ -1734,10 +1758,10 @@ dnl esac + + # Stub lib does not depend on shared/static configuration + if test "$RANLIB" = "" ; then +- MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS}' ++ MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS}' + INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)' + else +- MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@' ++ MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@' + INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))' + fi + |