128 lines
4.5 KiB
Text
128 lines
4.5 KiB
Text
$NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
|
|
|
|
--- unix/tcl.m4.orig 2005-12-06 02:42:37.000000000 +0000
|
|
+++ unix/tcl.m4
|
|
@@ -900,6 +900,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
|
|
# Step 3: set configuration options based on system name and version.
|
|
|
|
do64bit_ok=no
|
|
+ TCL_LIB_SPEC_RPATH=""
|
|
LDFLAGS_ORIG="$LDFLAGS"
|
|
TCL_EXPORT_FILE_SUFFIX=""
|
|
UNSHARED_LIB_SUFFIX=""
|
|
@@ -1147,6 +1148,9 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
DL_LIBS=""
|
|
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
|
|
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
|
|
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
IRIX-6.*)
|
|
SHLIB_CFLAGS=""
|
|
@@ -1172,6 +1176,9 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
esac
|
|
LDFLAGS="$LDFLAGS -n32"
|
|
fi
|
|
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
IRIX64-6.*)
|
|
SHLIB_CFLAGS=""
|
|
@@ -1195,6 +1202,9 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
LDFLAGS="$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"
|
|
@@ -1240,6 +1250,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'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
GNU*)
|
|
SHLIB_CFLAGS="-fPIC"
|
|
@@ -1299,28 +1312,36 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
LD_SEARCH_FLAGS=""
|
|
;;
|
|
NetBSD-*|FreeBSD-[[1-2]].*)
|
|
+ if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
|
|
+ CFLAGS_OPTIMIZE=-O0
|
|
+ fi
|
|
# Not available on all versions: check for include file.
|
|
AC_CHECK_HEADER(dlfcn.h, [
|
|
# NetBSD/SPARC needs -fPIC, -fpic will not do.
|
|
SHLIB_CFLAGS="-fPIC"
|
|
- SHLIB_LD="ld -Bshareable -x"
|
|
- SHLIB_LD_LIBS=""
|
|
+ SHLIB_LD_LIBS='${LIBS}'
|
|
SHLIB_SUFFIX=".so"
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS=""
|
|
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__
|
|
yes
|
|
#endif
|
|
- ],
|
|
+ ], [
|
|
AC_MSG_RESULT(yes)
|
|
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
|
|
+ SHLIB_LD='${TCL_CC} -shared -Wl,-x'
|
|
+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
|
|
+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
|
|
+ ], [
|
|
AC_MSG_RESULT(no)
|
|
+ SHLIB_LD="ld -Bshareable -x"
|
|
+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
|
|
+ TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib"
|
|
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
|
|
- )
|
|
+ ])
|
|
], [
|
|
SHLIB_CFLAGS=""
|
|
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
|
|
@@ -1736,6 +1757,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'
|
|
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
ULTRIX-4.*)
|
|
SHLIB_CFLAGS="-G 0"
|
|
@@ -1915,8 +1939,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 [$]@ ${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/} ${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}
|
|
|
|
@@ -1946,10 +1970,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
|
|
|